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

rst: Helper for restore stage barrier

Browse Source 
When finishing a stage we have to report this (decrement the
number of tasks in stage) and wait while stage switch. Write
a helper that does both.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-12-04 16:59:41 +03:00
parent fa35517082
commit 70af6cdd62
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cr-restore.c
View File

@@ -671,13 +671,9 @@ static int restore_one_zombie(int pid, int exit_code)
pr_info("Restoring zombie with %d code\n", exit_code);
if (task_entries != NULL) {
futex_dec_and_wake(&task_entries->nr_in_progress);
futex_wait_while(&task_entries->start, CR_STATE_RESTORE);
restore_finish_stage(CR_STATE_RESTORE);
zombie_prepare_signals();
futex_dec_and_wake(&task_entries->nr_in_progress);
futex_wait_while(&task_entries->start, CR_STATE_RESTORE_SIGCHLD);
restore_finish_stage(CR_STATE_RESTORE_SIGCHLD);
}
if (exit_code & 0x7f) {
@@ -1085,16 +1081,13 @@ static int restore_task_with_children(void *_arg)
if (current->pgid == current->pid.virt)
restore_pgid();
futex_dec_and_wake(&task_entries->nr_in_progress);
futex_wait_while(&task_entries->start, CR_STATE_FORKING);
restore_finish_stage(CR_STATE_FORKING);
if (current->pgid != current->pid.virt)
restore_pgid();
if (current->state != TASK_HELPER) {
futex_dec_and_wake(&task_entries->nr_in_progress);
futex_wait_while(&task_entries->start, CR_STATE_RESTORE_PGID);
}
if (current->state != TASK_HELPER)
restore_finish_stage(CR_STATE_RESTORE_PGID);
return restore_one_task(current->pid.virt);
}