Add process collector

processes/gops/process_info.go

@@ -10,6 +10,7 @@ import (
 
 type ProcessInfo struct {
 	PID      int32
+	PPID     int32
 	Name     string
 	RSS      uint64
 	PctMem   float64
@@ -50,6 +51,9 @@ func GetProcesses() ([]*ProcessInfo, error) {
 		processInfos = append(processInfos, processInfo)
 	}
 
+	// platform-specific post-processing on the collected info
+	postProcess(processInfos)
+
 	return processInfos, nil
 }
 
@@ -60,7 +64,12 @@ func newProcessInfo(p *process.Process, pid int32, totalMem float64) (*ProcessIn
 		return nil, err
 	}
 
-	name, err := pickName(p)
+	ppid, err := p.Ppid()
+	if err != nil {
+		return nil, err
+	}
+
+	name, err := p.Name()
 	if err != nil {
 		return nil, err
 	}
@@ -72,5 +81,5 @@ func newProcessInfo(p *process.Process, pid int32, totalMem float64) (*ProcessIn
 		return nil, err
 	}
 
-	return &ProcessInfo{pid, name, memInfo.RSS, pctMem, memInfo.VMS, username}, nil
+	return &ProcessInfo{pid, ppid, name, memInfo.RSS, pctMem, memInfo.VMS, username}, nil
 }

processes/gops/process_info_darwin.go

@@ -1,9 +1,4 @@
 package gops
 
-import (
-	"github.com/shirou/gopsutil/process"
-)
-
-func pickName(p *process.Process) (string, error) {
-	return p.Name()
-}
+// Do nothing for now
+func postProcess(processInfos []*ProcessInfo) {}

processes/gops/process_info_linux.go

@@ -1,20 +1,40 @@
 package gops
 
 import (
-	"strings"
+	"fmt"
 
 	"github.com/shirou/gopsutil/process"
 )
 
-func pickName(p *process.Process) (string, error) {
-	cmdline, err := p.Cmdline()
-	if err != nil {
-		return "", err
+// Build a hash pid -> ppid
+func buildPIDHash(processInfos []*ProcessInfo) (hash map[int32]int32) {
+	hash = make(map[int32]int32)
+	for _, processInfo := range processInfos {
+		hash[processInfo.PID] = processInfo.PPID
 	}
-	// Assume that the process is a kernel process when it has no args
-	if strings.TrimSpace(cmdline) == "" {
-		return "kernel", nil
+	return
+}
+
+// Return whether the PID is of a kernel thread, based on whether it has
+// the init process (PID 1) as ancestor
+func isKernelThread(pid int32, pidHash map[int32]int32) bool {
+	if pid == 1 {
+		return false
+	}
+	ppid, ok := pidHash[pid]
+	if !ok {
+		return true
 	}
 
-	return p.Name()
+	return isKernelThread(ppid, pidHash)
+}
+
+// Name processes "kernel" if they're a kernel thread
+func postProcess(processInfos []*ProcessInfo) {
+	pidHash := buildPIDHash(processInfos)
+	for _, processInfo := range processInfos {
+		if isKernelThread(processInfo.PID, pidHash) {
+			processInfo.Name = "kernel"
+		}
+	}
 }