From d6551d888b087aa56bc25260b9f7e5c718fa64d2 Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Tue, 29 Jul 2014 01:20:19 -0400 Subject: [PATCH] list processes --- container/docker/handler.go | 8 +++++++- container/raw/handler.go | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index 2e8662ad..040f74a7 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -26,6 +26,8 @@ import ( "strings" "github.com/docker/libcontainer" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" "github.com/fsouza/go-dockerclient" "github.com/google/cadvisor/container" containerLibcontainer "github.com/google/cadvisor/container/libcontainer" @@ -255,5 +257,9 @@ func (self *dockerContainerHandler) ListThreads(listType container.ListType) ([] } func (self *dockerContainerHandler) ListProcesses(listType container.ListType) ([]int, error) { - return nil, nil + c := &cgroups.Cgroup{ + Parent: self.parent, + Name: self.id, + } + return fs.GetPids(c) } diff --git a/container/raw/handler.go b/container/raw/handler.go index bf4947b5..ef5404e2 100644 --- a/container/raw/handler.go +++ b/container/raw/handler.go @@ -23,6 +23,7 @@ import ( "strings" "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/info" @@ -201,6 +202,5 @@ func (self *rawContainerHandler) ListThreads(listType container.ListType) ([]int } func (self *rawContainerHandler) ListProcesses(listType container.ListType) ([]int, error) { - // TODO(vmarmol): Implement - return nil, nil + return fs.GetPids(self.cgroup) }