From 304a166d7a9b8182a320c6ae574ab16559591745 Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 27 Jun 2014 14:47:02 -0400 Subject: [PATCH] working set = usage - inactive --- container/docker/handler.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index d7778afa..f6456a4c 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -209,10 +209,10 @@ func libcontainerToContainerStats(s *cgroups.Stats, mi *info.MachineInfo) *info. ret.Memory.ContainerData.Pgmajfault = v ret.Memory.HierarchicalData.Pgmajfault = v } - if v, ok := s.MemoryStats.Stats["active_anon"]; ok { - ret.Memory.WorkingSet = v - if v, ok := s.MemoryStats.Stats["active_file"]; ok { - ret.Memory.WorkingSet += v + if v, ok := s.MemoryStats.Stats["total_inactive_anon"]; ok { + ret.Memory.WorkingSet = ret.Memory.Usage - v + if v, ok := s.MemoryStats.Stats["total_active_file"]; ok { + ret.Memory.WorkingSet -= v } } return ret