mirror of
https://github.com/weaveworks/scope.git
synced 2026-02-19 20:40:03 +00:00
b585a362ac
This fixes the regression where process names weren't appearing for Darwin probes. Makes testing easier. Also, changes the process walker to operate on value types. There's no performance advantage to using reference types for something of this size, and there appeared to be a data race in the Darwin port that caused nodes to gain and lose process names over time. Also, restructures how to enable docker scraping. Default false when run manually, and enabled via --probe.docker true in the scope script.
91 lines
2.3 KiB
Go
91 lines
2.3 KiB
Go
package process_test
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"reflect"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/weaveworks/scope/probe/process"
|
|
"github.com/weaveworks/scope/test"
|
|
)
|
|
|
|
type mockProcess struct {
|
|
name, comm, cmdline string
|
|
}
|
|
|
|
func (p mockProcess) Name() string { return p.name }
|
|
func (p mockProcess) Size() int64 { return 0 }
|
|
func (p mockProcess) Mode() os.FileMode { return 0 }
|
|
func (p mockProcess) ModTime() time.Time { return time.Now() }
|
|
func (p mockProcess) IsDir() bool { return true }
|
|
func (p mockProcess) Sys() interface{} { return nil }
|
|
|
|
func TestWalker(t *testing.T) {
|
|
oldReadDir, oldReadFile := process.ReadDir, process.ReadFile
|
|
defer func() {
|
|
process.ReadDir = oldReadDir
|
|
process.ReadFile = oldReadFile
|
|
}()
|
|
|
|
processes := map[string]mockProcess{
|
|
"3": {name: "3", comm: "curl\n", cmdline: "curl\000google.com"},
|
|
"2": {name: "2", comm: "bash\n"},
|
|
"4": {name: "4", comm: "apache\n"},
|
|
"notapid": {name: "notapid"},
|
|
"1": {name: "1", comm: "init\n"},
|
|
}
|
|
|
|
process.ReadDir = func(path string) ([]os.FileInfo, error) {
|
|
result := []os.FileInfo{}
|
|
for _, p := range processes {
|
|
result = append(result, p)
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
process.ReadFile = func(path string) ([]byte, error) {
|
|
splits := strings.Split(path, "/")
|
|
|
|
pid := splits[len(splits)-2]
|
|
process, ok := processes[pid]
|
|
if !ok {
|
|
return nil, fmt.Errorf("not found")
|
|
}
|
|
|
|
file := splits[len(splits)-1]
|
|
switch file {
|
|
case "comm":
|
|
return []byte(process.comm), nil
|
|
case "stat":
|
|
pid, _ := strconv.Atoi(splits[len(splits)-2])
|
|
parent := pid - 1
|
|
return []byte(fmt.Sprintf("%d na R %d 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1", pid, parent)), nil
|
|
case "cmdline":
|
|
return []byte(process.cmdline), nil
|
|
}
|
|
|
|
return nil, fmt.Errorf("not found")
|
|
}
|
|
|
|
want := map[int]process.Process{
|
|
3: {PID: 3, PPID: 2, Comm: "curl", Cmdline: "curl google.com", Threads: 1},
|
|
2: {PID: 2, PPID: 1, Comm: "bash", Cmdline: "", Threads: 1},
|
|
4: {PID: 4, PPID: 3, Comm: "apache", Cmdline: "", Threads: 1},
|
|
1: {PID: 1, PPID: 0, Comm: "init", Cmdline: "", Threads: 1},
|
|
}
|
|
|
|
have := map[int]process.Process{}
|
|
walker := process.NewWalker("unused")
|
|
err := walker.Walk(func(p process.Process) {
|
|
have[p.PID] = p
|
|
})
|
|
|
|
if err != nil || !reflect.DeepEqual(want, have) {
|
|
t.Errorf("%v (%v)", test.Diff(want, have), err)
|
|
}
|
|
}
|