opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

cgroups: fix times conversion

Browse Source 
convert the time we read in microseconds to nanoseconds.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-07-02 12:50:15 +02:00
parent 3b9ce8a3ac
commit 7423426f73
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cgroups/cgroups.go
View File

@ -30,7 +30,7 @@ type CgroupControl struct {
additionalControllers []controller additionalControllers []controller
} }
// CPUUsage keeps stats for the CPU usage // CPUUsage keeps stats for the CPU usage (unit: nanoseconds)
type CPUUsage struct { type CPUUsage struct {
Kernel uint64 Kernel uint64
Total uint64 Total uint64

2
pkg/cgroups/cpu.go
View File

@ -85,12 +85,14 @@ func (c *cpuHandler) Stat(ctr *CgroupControl, m *Metrics) error {
if err != nil { if err != nil {
return err return err
} }
usage.Kernel *= 1000
} }
if val, found := values["system_usec"]; found { if val, found := values["system_usec"]; found {
usage.Total, err = strconv.ParseUint(cleanString(val[0]), 10, 0) usage.Total, err = strconv.ParseUint(cleanString(val[0]), 10, 0)
if err != nil { if err != nil {
return err return err
} }
usage.Total *= 1000
} }
// FIXME: How to read usage.PerCPU? // FIXME: How to read usage.PerCPU?
} else { } else {