mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

pstree: Skip zombie dumping tricks if there is kdat.has_nspid

Browse Source 
In case of kdat.has_nspid == true, zombie pids are already
dumped.

v4: New

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-05-05 19:15:18 +03:00 committed by Andrei Vagin
parent 3e6fdadebc
commit fec8dc4a1e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
criu/cr-dump.c
View File

@ -1136,6 +1136,7 @@ static int dump_zombies(void)
continue; continue;
if (vpid(item) < 0) { if (vpid(item) < 0) {
BUG_ON(kdat.has_nspid);
if (!pidns) if (!pidns)
vpid(item) = item->pid->real; vpid(item) = item->pid->real;
else if (root_item == item) { else if (root_item == item) {
@ -1149,8 +1150,10 @@ static int dump_zombies(void)
if (parse_pid_stat(vpid(item), &pps_buf) < 0) if (parse_pid_stat(vpid(item), &pps_buf) < 0)
goto err; goto err;
if (!kdat.has_nspid) {
vsid(item) = pps_buf.sid; vsid(item) = pps_buf.sid;
vpgid(item) = pps_buf.pgid; vpgid(item) = pps_buf.pgid;
}
BUG_ON(!list_empty(&item->children)); BUG_ON(!list_empty(&item->children));
if (dump_one_zombie(item, &pps_buf) < 0) if (dump_one_zombie(item, &pps_buf) < 0)