mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 23:05:39 +00:00
Code Issues Releases Wiki Activity

restore: add fast path to find a parent pstree item

Browse Source 
Taking into account the way the dump saves pstrees in the image.

If pstree.img isn't edited, a slow path should not be executed at all.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2012-05-31 14:50:00 +04:00
committed by Pavel Emelyanov
parent cf63c1d9e8
commit f7d0263c69
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cr-restore.c
View File

@@ -115,9 +115,21 @@ static int prepare_pstree(void)
pi->parent = NULL; pi->parent = NULL;
INIT_LIST_HEAD(&pi->list); INIT_LIST_HEAD(&pi->list);
} else { } else {
for_each_pstree_item(parent) /*
* Fast path -- if the pstree image is not edited, the
* parent of any item should have already being restored
* and sit among the last item's ancestors.
*/
while (parent) {
if (parent->pid == e.ppid) if (parent->pid == e.ppid)
break; break;
parent = parent->parent;
}
if (parent == NULL)
for_each_pstree_item(parent)
if (parent->pid == e.ppid)
break;
if (parent == NULL) { if (parent == NULL) {
pr_err("Can't find a parent for %d", pi->pid); pr_err("Can't find a parent for %d", pi->pid);
@@ -129,6 +141,8 @@ static int prepare_pstree(void)
list_add(&pi->list, &parent->children); list_add(&pi->list, &parent->children);
} }
parent = pi;
pi->nr_threads = e.nr_threads; pi->nr_threads = e.nr_threads;
pi->threads = xmalloc(e.nr_threads * sizeof(u32)); pi->threads = xmalloc(e.nr_threads * sizeof(u32));
if (!pi->threads) if (!pi->threads)