diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-02 12:50:15 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-02 12:59:26 +0200 |
| commit | 7423426f73f367cd4e9246eb1fb1b6ac1ed33644 (patch) | |
| tree | e584da6df22b92f76169d8da0eaea1032ed6e2fb /pkg/cgroups | |
| parent | 3b9ce8a3accdc906fb0c6c51e61556c26fbc9a43 (diff) | |
| download | podman-7423426f73f367cd4e9246eb1fb1b6ac1ed33644.tar.gz podman-7423426f73f367cd4e9246eb1fb1b6ac1ed33644.tar.bz2 podman-7423426f73f367cd4e9246eb1fb1b6ac1ed33644.zip | |
cgroups: fix times conversion
convert the time we read in microseconds to nanoseconds.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/cgroups')
| -rw-r--r-- | pkg/cgroups/cgroups.go | 2 | ||||
| -rw-r--r-- | pkg/cgroups/cpu.go | 2 |
2 files changed, 3 insertions, 1 deletions
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 { |