Ignore unified paths with no subsystem

crosbymichael · crosbymichael · commit fe1947308d8f · 2017-07-10T09:51:08.000-07:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/paths_test.go b/paths_test.go
@@ -60,3 +60,27 @@ func TestRootPath(t *testing.T) {
 		t.Errorf("expected / but received %q", p)
 	}
 }
+
+func TestEmptySubsystem(t *testing.T) {
+	const data = `10:devices:/user.slice
+	9:net_cls,net_prio:/
+	8:blkio:/
+	7:freezer:/
+	6:perf_event:/
+	5:cpuset:/
+	4:memory:/
+	3:pids:/user.slice/user-1000.slice/user@1000.service
+	2:cpu,cpuacct:/
+	1:name=systemd:/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service
+	0::/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service`
+	r := strings.NewReader(data)
+	paths, err := parseCgroupFromReader(r)
+	if err != nil {
+		t.Fatal(err)
+	}
+	for subsystem, path := range paths {
+		if subsystem == "" {
+			t.Fatalf("empty subsystem for %q", path)
+		}
+	}
+}
diff --git a/utils.go b/utils.go
@@ -207,7 +207,9 @@ func parseCgroupFromReader(r io.Reader) (map[string]string, error) {
 			return nil, fmt.Errorf("invalid cgroup entry: must contain at least two colons: %v", text)
 		}
 		for _, subs := range strings.Split(parts[1], ",") {
-			cgroups[subs] = parts[2]
+			if subs != "" {
+				cgroups[subs] = parts[2]
+			}
 		}
 	}
 	return cgroups, nil

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,9 @@ func parseCgroupFromReader(r io.Reader) (map[string]string, error) {`
`207`	`207`	`return nil, fmt.Errorf("invalid cgroup entry: must contain at least two colons: %v", text)`
`208`	`208`	`}`
`209`	`209`	`for _, subs := range strings.Split(parts[1], ",") {`
`210`		`- cgroups[subs] = parts[2]`
	`210`	`+ if subs != "" {`
	`211`	`+ cgroups[subs] = parts[2]`
	`212`	`+ }`
`211`	`213`	`}`
`212`	`214`	`}`
`213`	`215`	`return cgroups, nil`