summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorDaniel Dao <dqminh@cloudflare.com>2021-02-12 12:36:33 +0000
committerDaniel Dao <dqminh89@gmail.com>2021-02-24 15:20:43 +0000
commit306a9477daa7b57ef62133bcf3f2f5966e26ffca (patch)
treeb2c4c8000b9cb06e43fc387364dee2d6a939c25f /pkg/sentry
parent24ea8003a49dbbcdfbbf2e5969c4bf8002063b86 (diff)
return root pids with runsc ps
`runsc ps` currently return pid for a task's immediate pid namespace, which is confusing when there're multiple pid namespaces. We should return only pids in the root namespace. Before: ``` 1000 1 0 0 ? 02:24 250ms chrome 1000 1 0 0 ? 02:24 40ms dumb-init 1000 1 0 0 ? 02:24 240ms chrome 1000 2 1 0 ? 02:24 2.78s node ``` After: ``` UID PID PPID C TTY STIME TIME CMD 1000 1 0 0 ? 12:35 0s dumb-init 1000 2 1 7 ? 12:35 240ms node 1000 13 2 21 ? 12:35 2.33s chrome 1000 27 13 3 ? 12:35 260ms chrome ``` Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/control/proc.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/control/proc.go b/pkg/sentry/control/proc.go
index f93bd64e0..367849e75 100644
--- a/pkg/sentry/control/proc.go
+++ b/pkg/sentry/control/proc.go
@@ -334,8 +334,8 @@ func PrintPIDsJSON(pl []*Process) (string, error) {
func Processes(k *kernel.Kernel, containerID string, out *[]*Process) error {
ts := k.TaskSet()
now := k.RealtimeClock().Now()
- for _, tg := range ts.Root.ThreadGroups() {
- pidns := tg.PIDNamespace()
+ pidns := ts.Root
+ for _, tg := range pidns.ThreadGroups() {
pid := pidns.IDOfThreadGroup(tg)
// If tg has already been reaped ignore it.