Merge pull request shirou#1140 from punya/proc-created-v3

Copy load.MiscStat ProcsCreated field from v2 to v3 (supersedes shirou#1123)

v3/load/load.go

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

v3/load/load_bsd.go

@@ -1,3 +1,4 @@
+//go:build freebsd || openbsd
 // +build freebsd openbsd
 
 package load
@@ -37,6 +38,12 @@ func AvgWithContext(ctx context.Context) (*AvgStat, error) {
 	return ret, nil
 }
 
+type forkstat struct {
+	forks    int
+	vforks   int
+	__tforks int
+}
+
 // Misc returns miscellaneous host-wide statistics.
 // darwin use ps command to get process running/blocked count.
 // Almost same as Darwin implementation, but state is different.
@@ -64,5 +71,11 @@ func MiscWithContext(ctx context.Context) (*MiscStat, error) {
 		}
 	}
 
+	f, err := getForkStat()
+	if err != nil {
+		return nil, err
+	}
+	ret.ProcsCreated = f.forks
+
 	return &ret, nil
 }

v3/load/load_freebsd.go

@@ -0,0 +1,7 @@
+// +build freebsd
+
+package load
+
+func getForkStat() (forkstat, error) {
+	return forkstat{}, nil
+}

v3/load/load_linux.go

@@ -92,6 +92,8 @@ func MiscWithContext(ctx context.Context) (*MiscStat, error) {
 			continue
 		}
 		switch fields[0] {
+		case "processes":
+			ret.ProcsCreated = int(v)
 		case "procs_running":
 			ret.ProcsRunning = int(v)
 		case "procs_blocked":

v3/load/load_openbsd.go

@@ -0,0 +1,17 @@
+// +build openbsd
+
+package load
+
+import (
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+func getForkStat() (forkstat, error) {
+	b, err := unix.SysctlRaw("kern.forkstat")
+	if err != nil {
+		return forkstat{}, err
+	}
+	return *(*forkstat)(unsafe.Pointer((&b[0]))), nil
+}

v3/load/load_test.go

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