Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-21 09:10:10 +00:00
Code Issues Projects Releases Wiki Activity

dump: optimize dead_pid_conflict by searching in rbtree

Browse source 
All task are collected in rbtree what allows us to search
any task by a virtual pid for O(n log(n)).

Signed-off-by: Andrew Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Andrew Vagin 2016-05-10 03:56:59 +03:00 • committed by Pavel Emelyanov
parent 018e8985d3
commit 23b769498c
3 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
criu/files-reg.c
View file

@ -806,36 +806,34 @@ static int dump_linked_remap(char *path, int len, const struct stat *ost,
static pid_t *dead_pids;
static int n_dead_pids;
static int dead_pid_check_threads(struct pstree_item *item, pid_t pid)
{
int i;
for (i = 0; i < item->nr_threads; i++) {
/*
* If the dead PID was given to a main thread of another
* process, this is handled during restore.
*/
if (item->pid.real == item->threads[i].real ||
item->threads[i].virt != pid)
continue;
pr_err("Conflict with a dead task with the same PID as of this thread (virt %d, real %d).\n",
item->threads[i].virt, item->threads[i].real);
return 1;
}
return 0;
}
int dead_pid_conflict(void)
{
struct pstree_item *item;
int i;
for (i = 0; i < n_dead_pids; i++) {
for_each_pstree_item(item)
if (dead_pid_check_threads(item, dead_pids[i]))
return 1;
struct pid *node;
pid_t pid = dead_pids[i];
node = pstree_pid_by_virt(pid);
if (!node)
continue;
if (node->state != TASK_THREAD) {
struct pstree_item *item;
/*
* If the dead PID was given to a main thread of another
* process, this is handled during restore.
*/
item = container_of(node, struct pstree_item, pid);
if (item->pid.real == item->threads[i].real ||
item->threads[i].virt != pid)
continue;
}
pr_err("Conflict with a dead task with the same PID as of this thread (virt %d, real %d).\n",
node->virt, node->real);
return -1;
}
return 0;

1
criu/include/pstree.h
View file

@ -68,6 +68,7 @@ extern void init_pstree_helper(struct pstree_item *ret);
extern struct pstree_item *lookup_create_item(pid_t pid);
extern void pstree_insert_pid(pid_t pid, struct pid *pid_node);
extern struct pid *pstree_pid_by_virt(pid_t pid);
extern struct pstree_item *root_item;
extern struct pstree_item *pstree_item_next(struct pstree_item *item);

2
criu/pstree.c
View file

@ -430,7 +430,7 @@ struct pstree_item *lookup_create_item(pid_t pid)
return container_of(node, struct pstree_item, pid);
}
static struct pid *pstree_pid_by_virt(pid_t pid)
struct pid *pstree_pid_by_virt(pid_t pid)
{
struct rb_node *node = pid_root_rb.rb_node;