Merge pull request #682 from pytimer/add-load-procstotal

add ProcsTotal in load

load/load.go

@@ -20,6 +20,7 @@ func (l AvgStat) String() string {
 }
 
 type MiscStat struct {
+	ProcsTotal   int `json:"procsTotal"`
 	ProcsRunning int `json:"procsRunning"`
 	ProcsBlocked int `json:"procsBlocked"`
 	Ctxt         int `json:"ctxt"`

load/load_linux.go

@@ -16,14 +16,11 @@ func Avg() (*AvgStat, error) {
 }
 
 func AvgWithContext(ctx context.Context) (*AvgStat, error) {
-	filename := common.HostProc("loadavg")
-	line, err := ioutil.ReadFile(filename)
+	values, err := readLoadAvgFromFile()
 	if err != nil {
 		return nil, err
 	}
 
-	values := strings.Fields(string(line))
-
 	load1, err := strconv.ParseFloat(values[0], 64)
 	if err != nil {
 		return nil, err
@@ -83,5 +80,30 @@ func MiscWithContext(ctx context.Context) (*MiscStat, error) {
 
 	}
 
+	procsTotal, err := getProcsTotal()
+	if err != nil {
+		return ret, err
+	}
+	ret.ProcsTotal = int(procsTotal)
+
 	return ret, nil
 }
+
+func getProcsTotal() (int64, error) {
+	values, err := readLoadAvgFromFile()
+	if err != nil {
+		return 0, err
+	}
+	return strconv.ParseInt(strings.Split(values[3], "/")[1], 10, 64)
+}
+
+func readLoadAvgFromFile() ([]string, error) {
+	loadavgFilename := common.HostProc("loadavg")
+	line, err := ioutil.ReadFile(loadavgFilename)
+	if err != nil {
+		return nil, err
+	}
+
+	values := strings.Fields(string(line))
+	return values, nil
+}

load/load_test.go

@@ -46,11 +46,12 @@ func TestMisc(t *testing.T) {
 
 func TestMiscStatString(t *testing.T) {
 	v := MiscStat{
+		ProcsTotal:   4,
 		ProcsRunning: 1,
 		ProcsBlocked: 2,
 		Ctxt:         3,
 	}
-	e := `{"procsRunning":1,"procsBlocked":2,"ctxt":3}`
+	e := `{"procsTotal":4,"procsRunning":1,"procsBlocked":2,"ctxt":3}`
 	if e != fmt.Sprintf("%v", v) {
 		t.Errorf("TestMiscString string is invalid: %v", v)
 	}