From a04d413000c9046cb99f02f1c60e9ded20e1b3e2 Mon Sep 17 00:00:00 2001 From: Kirill Tkhai Date: Fri, 5 May 2017 19:15:42 +0300 Subject: [PATCH] images: Add NSpids pstree descriptions Add new fields to store NSpid, NSsid, NSpgid for task and NStid for threads. Signed-off-by: Kirill Tkhai Signed-off-by: Andrei Vagin --- criu/pstree.c | 3 +++ images/pstree.proto | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/criu/pstree.c b/criu/pstree.c index 9f9df89db..885214f17 100644 --- a/criu/pstree.c +++ b/criu/pstree.c @@ -339,6 +339,9 @@ int dump_pstree(struct pstree_item *root_item) e.pgid = vpgid(item); e.sid = vsid(item); e.n_threads = item->nr_threads; + e.has_pid = true; + e.has_pgid = true; + e.has_sid = true; e.threads = xmalloc(sizeof(e.threads[0]) * e.n_threads); if (!e.threads) diff --git a/images/pstree.proto b/images/pstree.proto index 23e88aa74..6bb560849 100644 --- a/images/pstree.proto +++ b/images/pstree.proto @@ -1,9 +1,18 @@ syntax = "proto2"; -message pstree_entry { - required uint32 pid = 1; - required uint32 ppid = 2; - required uint32 pgid = 3; - required uint32 sid = 4; - repeated uint32 threads = 5; +message ns_tid { + repeated uint32 tid = 1; +} + +message pstree_entry { + optional uint32 pid = 1; + required uint32 ppid = 2; /* Pid of parent in pid_ns NS_ROOT */ + optional uint32 pgid = 3; + optional uint32 sid = 4; + repeated uint32 threads = 5; + + repeated uint32 ns_pid = 6; + repeated uint32 ns_pgid = 7; + repeated uint32 ns_sid = 8; + repeated ns_tid tids = 9; }