From ae89dc28d07e1c6142201c282a76d3f237821710 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 1 Feb 2018 12:55:28 -0500 Subject: Update containerd/cgroups repo fix perf issue Signed-off-by: Matthew Heon --- vendor/github.com/containerd/cgroups/cpuacct.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'vendor/github.com/containerd/cgroups/cpuacct.go') diff --git a/vendor/github.com/containerd/cgroups/cpuacct.go b/vendor/github.com/containerd/cgroups/cpuacct.go index 329234887..443692d21 100644 --- a/vendor/github.com/containerd/cgroups/cpuacct.go +++ b/vendor/github.com/containerd/cgroups/cpuacct.go @@ -30,7 +30,7 @@ func (c *cpuacctController) Path(path string) string { return filepath.Join(c.root, path) } -func (c *cpuacctController) Stat(path string, stats *Stats) error { +func (c *cpuacctController) Stat(path string, stats *Metrics) error { user, kernel, err := c.getUsage(path) if err != nil { return err @@ -43,17 +43,10 @@ func (c *cpuacctController) Stat(path string, stats *Stats) error { if err != nil { return err } - stats.cpuMu.Lock() - cpu := stats.Cpu - if cpu == nil { - cpu = &CpuStat{} - stats.Cpu = cpu - } - stats.cpuMu.Unlock() - cpu.Usage.Total = total - cpu.Usage.User = user - cpu.Usage.Kernel = kernel - cpu.Usage.PerCpu = percpu + stats.CPU.Usage.Total = total + stats.CPU.Usage.User = user + stats.CPU.Usage.Kernel = kernel + stats.CPU.Usage.PerCPU = percpu return nil } -- cgit v1.2.3-54-g00ecf