From 7423426f73f367cd4e9246eb1fb1b6ac1ed33644 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 2 Jul 2019 12:50:15 +0200 Subject: cgroups: fix times conversion convert the time we read in microseconds to nanoseconds. Signed-off-by: Giuseppe Scrivano --- pkg/cgroups/cgroups.go | 2 +- pkg/cgroups/cpu.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go index 426bda559..d6c19212b 100644 --- a/pkg/cgroups/cgroups.go +++ b/pkg/cgroups/cgroups.go @@ -30,7 +30,7 @@ type CgroupControl struct { additionalControllers []controller } -// CPUUsage keeps stats for the CPU usage +// CPUUsage keeps stats for the CPU usage (unit: nanoseconds) type CPUUsage struct { Kernel uint64 Total uint64 diff --git a/pkg/cgroups/cpu.go b/pkg/cgroups/cpu.go index 3f969fd3c..8640d490e 100644 --- a/pkg/cgroups/cpu.go +++ b/pkg/cgroups/cpu.go @@ -85,12 +85,14 @@ func (c *cpuHandler) Stat(ctr *CgroupControl, m *Metrics) error { if err != nil { return err } + usage.Kernel *= 1000 } if val, found := values["system_usec"]; found { usage.Total, err = strconv.ParseUint(cleanString(val[0]), 10, 0) if err != nil { return err } + usage.Total *= 1000 } // FIXME: How to read usage.PerCPU? } else { -- cgit v1.2.3-54-g00ecf