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

restore: remove restore_one_fake, which duplicates the code

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-08-16 18:55:26 +04:00
committed by Pavel Emelyanov
parent 33c70a244e
commit f824d8c3e9
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cr-restore.c
View File

@@ -735,14 +735,6 @@ static inline int sig_fatal(int sig)
struct task_entries *task_entries; struct task_entries *task_entries;
static int restore_one_fake(void)
{
/* We should wait here, otherwise last_pid will be changed. */
futex_wait_while(&task_entries->start, CR_STATE_FORKING);
futex_wait_while(&task_entries->start, CR_STATE_RESTORE_PGID);
return 0;
}
static int restore_one_zombie(int pid, CoreEntry *core) static int restore_one_zombie(int pid, CoreEntry *core)
{ {
int exit_code = core->tc->exit_code; int exit_code = core->tc->exit_code;
@@ -1203,10 +1195,11 @@ static int restore_task_with_children(void *_arg)
if (current->pgid != current->pid.virt) if (current->pgid != current->pid.virt)
restore_pgid(); restore_pgid();
if (current->state == TASK_HELPER)
return restore_one_fake();
restore_finish_stage(CR_STATE_RESTORE_PGID); restore_finish_stage(CR_STATE_RESTORE_PGID);
if (current->state == TASK_HELPER)
return 0;
return restore_one_task(current->pid.virt, ca->core); return restore_one_task(current->pid.virt, ca->core);
} }
@@ -1216,9 +1209,8 @@ static inline int stage_participants(int next_stage)
case CR_STATE_RESTORE_NS: case CR_STATE_RESTORE_NS:
return 1; return 1;
case CR_STATE_FORKING: case CR_STATE_FORKING:
return task_entries->nr_tasks + task_entries->nr_helpers;
case CR_STATE_RESTORE_PGID: case CR_STATE_RESTORE_PGID:
return task_entries->nr_tasks; return task_entries->nr_tasks + task_entries->nr_helpers;
case CR_STATE_RESTORE: case CR_STATE_RESTORE:
case CR_STATE_RESTORE_SIGCHLD: case CR_STATE_RESTORE_SIGCHLD:
return task_entries->nr_threads; return task_entries->nr_threads;