prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #139 from monnand/list-procs

Browse Source 
list processes
This commit is contained in:
Victor Marmol 2014-07-29 08:27:06 -07:00
commit 4d2cc62932
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container/docker/handler.go
View File

@ -26,6 +26,8 @@ import (
"strings" "strings"
"github.com/docker/libcontainer" "github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/fs"
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
"github.com/google/cadvisor/container" "github.com/google/cadvisor/container"
containerLibcontainer "github.com/google/cadvisor/container/libcontainer" 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) { 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)
} }

4
container/raw/handler.go
View File

@ -23,6 +23,7 @@ import (
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/fs"
"github.com/google/cadvisor/container" "github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/container/libcontainer"
"github.com/google/cadvisor/info" "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) { func (self *rawContainerHandler) ListProcesses(listType container.ListType) ([]int, error) {
// TODO(vmarmol): Implement return fs.GetPids(self.cgroup)
return nil, nil
} }