Merge pull request #431 from mtrmac/cgroup-usage

mtrmac · web-flow · commit bf349aec2ee8 · 2025-11-03T21:42:37.000+01:00
Fix parsing of cgroupv2 cpu.stat
diff --git a/common/pkg/cgroups/cpu_linux.go b/common/pkg/cgroups/cpu_linux.go
@@ -40,14 +40,14 @@ func (c *linuxCPUHandler) Stat(ctr *CgroupControl, m *cgroups.Stats) error {
 		if err != nil {
 			return err
 		}
-		cpu.CpuUsage.UsageInKernelmode *= 1000
+		cpu.CpuUsage.TotalUsage *= 1000
 	}
 	if val, found := values["system_usec"]; found {
 		cpu.CpuUsage.UsageInKernelmode, err = strconv.ParseUint(cleanString(val[0]), 10, 64)
 		if err != nil {
 			return err
 		}
-		cpu.CpuUsage.TotalUsage *= 1000
+		cpu.CpuUsage.UsageInKernelmode *= 1000
 	}
 	m.CpuStats = cpu
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ func (c linuxCPUHandler) Stat(ctr CgroupControl, m *cgroups.Stats) error {`
`40`	`40`	`if err != nil {`
`41`	`41`	`return err`
`42`	`42`	`}`
`43`		`- cpu.CpuUsage.UsageInKernelmode *= 1000`
	`43`	`+ cpu.CpuUsage.TotalUsage *= 1000`
`44`	`44`	`}`
`45`	`45`	`if val, found := values["system_usec"]; found {`
`46`	`46`	`cpu.CpuUsage.UsageInKernelmode, err = strconv.ParseUint(cleanString(val[0]), 10, 64)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`
`50`		`- cpu.CpuUsage.TotalUsage *= 1000`
	`50`	`+ cpu.CpuUsage.UsageInKernelmode *= 1000`
`51`	`51`	`}`
`52`	`52`	`m.CpuStats = cpu`
`53`	`53`	`return nil`