mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

pstree: Pre-dump ns ids before tasks

Browse Source 
We need to know root_item's pid_ns nesting level
(if its pid_ns is similar to criu's, or not)
before collect_tasks(). Thus we populate
pstree_item::pid::level correctly.

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:14:50 +03:00
committed by Andrei Vagin
parent 0892ab3f56
commit f334e43bcf
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
criu/cr-dump.c
View File

@@ -803,9 +803,8 @@ err:
return ret;
}
static int collect_pstree_ids_predump(void)
static int predump_criu_ns_ids(void)
{
struct pstree_item *item;
struct pid pid;
struct {
struct pstree_item i;
@@ -820,8 +819,12 @@ static int collect_pstree_ids_predump(void)
crt.i.pid->state = TASK_ALIVE;
crt.i.pid->real = getpid();
if (predump_task_ns_ids(&crt.i))
return -1;
return predump_task_ns_ids(&crt.i);
}
static int collect_pstree_ids_predump()
{
struct pstree_item *item;
for_each_pstree_item(item) {
if (item->pid->state == TASK_DEAD)
@@ -1602,9 +1605,17 @@ int cr_pre_dump_tasks(pid_t pid)
if (setup_alarm_handler())
goto err;
/*
* Pre-dump criu's and root_item's ns ids, as they are need
* to discover root_item's pid_ns nesting.
*/
if (predump_criu_ns_ids() || predump_task_ns_ids(root_item))
goto err;
if (collect_pstree())
goto err;
/* Pre-dump other tasks ns ids */
if (collect_pstree_ids_predump())
goto err;
@@ -1806,6 +1817,8 @@ int cr_dump_tasks(pid_t pid)
if (setup_alarm_handler())
goto err;
if (predump_task_ns_ids(root_item))
goto err;
/*
* The collect_pstree will also stop (PTRACE_SEIZE) the tasks
* thus ensuring that they don't modify anything we collect