From f5e60cf775ff4c4145f90f5e181fcddf961fb39a Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 20 Mar 2016 22:04:02 +1100 Subject: [PATCH] libcontainer: cgroups: add statistics for kmem.tcp Signed-off-by: Aleksa Sarai --- libcontainer/cgroups/fs/memory.go | 5 +++++ libcontainer/cgroups/stats.go | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go index 179d8bc2d..3b8ff21ab 100644 --- a/libcontainer/cgroups/fs/memory.go +++ b/libcontainer/cgroups/fs/memory.go @@ -144,6 +144,11 @@ func (s *MemoryGroup) GetStats(path string, stats *cgroups.Stats) error { return err } stats.MemoryStats.KernelUsage = kernelUsage + kernelTCPUsage, err := getMemoryData(path, "kmem.tcp") + if err != nil { + return err + } + stats.MemoryStats.KernelTCPUsage = kernelTCPUsage return nil } diff --git a/libcontainer/cgroups/stats.go b/libcontainer/cgroups/stats.go index 7eba44148..b3a5bf116 100644 --- a/libcontainer/cgroups/stats.go +++ b/libcontainer/cgroups/stats.go @@ -47,8 +47,11 @@ type MemoryStats struct { // usage of memory + swap SwapUsage MemoryData `json:"swap_usage,omitempty"` // usage of kernel memory - KernelUsage MemoryData `json:"kernel_usage,omitempty"` - Stats map[string]uint64 `json:"stats,omitempty"` + KernelUsage MemoryData `json:"kernel_usage,omitempty"` + // usage of kernel TCP memory + KernelTCPUsage MemoryData `json:"kernel_tcp_usage,omitempty"` + + Stats map[string]uint64 `json:"stats,omitempty"` } type PidsStats struct {