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

dump: Move threads dumping into task dumping routine

Browse Source 
This is to make sure we dump zombies w/o threads.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Pavel Emelyanov
2012-01-22 20:13:59 +04:00
committed by Cyrill Gorcunov
parent 8092d77bd3
commit cfbb9239ec
1 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
cr-dump.c
View File

@@ -1022,8 +1022,39 @@ err:
static struct proc_pid_stat pps_buf; static struct proc_pid_stat pps_buf;
static int dump_one_task(pid_t pid, struct cr_fdset *cr_fdset) static int dump_task_threads(struct pstree_item *item)
{ {
int i;
struct cr_fdset *cr_fdset_thread = NULL;
if (item->nr_threads == 1)
return 0;
for (i = 0; i < item->nr_threads; i++) {
/* Leader is already dumped */
if (item->pid == item->threads[i])
continue;
cr_fdset_thread = prep_cr_fdset_for_dump(item->threads[i], CR_FD_DESC_CORE);
if (!cr_fdset_thread)
goto err;
if (dump_task_thread(item->threads[i], cr_fdset_thread))
goto err;
close_cr_fdset(&cr_fdset_thread);
}
return 0;
err:
close_cr_fdset(&cr_fdset_thread);
return -1;
}
static int dump_one_task(struct pstree_item *item, struct cr_fdset *cr_fdset)
{
pid_t pid = item->pid;
LIST_HEAD(vma_area_list); LIST_HEAD(vma_area_list);
struct parasite_ctl *parasite_ctl; struct parasite_ctl *parasite_ctl;
int ret = -1; int ret = -1;
@@ -1111,6 +1142,10 @@ static int dump_one_task(pid_t pid, struct cr_fdset *cr_fdset)
goto err; goto err;
} }
free_mappings(&vma_area_list);
return dump_task_threads(item);
err: err:
free_mappings(&vma_area_list); free_mappings(&vma_area_list);
return ret; return ret;
@@ -1120,7 +1155,6 @@ int cr_dump_tasks(pid_t pid, struct cr_options *opts)
{ {
LIST_HEAD(pstree_list); LIST_HEAD(pstree_list);
struct cr_fdset *cr_fdset = NULL; struct cr_fdset *cr_fdset = NULL;
struct cr_fdset *cr_fdset_thread = NULL;
struct pstree_item *item; struct pstree_item *item;
int i, ret = -1, pid_dir; int i, ret = -1, pid_dir;
@@ -1156,28 +1190,9 @@ int cr_dump_tasks(pid_t pid, struct cr_options *opts)
goto err; goto err;
} }
if (dump_one_task(item->pid, cr_fdset)) if (dump_one_task(item, cr_fdset))
goto err; goto err;
if (item->nr_threads > 1) {
for (i = 0; i < item->nr_threads; i++) {
/* Leader is already dumped */
if (item->pid == item->threads[i])
continue;
cr_fdset_thread = prep_cr_fdset_for_dump(item->threads[i], CR_FD_DESC_CORE);
if (!cr_fdset_thread)
goto err;
if (dump_task_thread(item->threads[i], cr_fdset_thread))
goto err;
close_cr_fdset(&cr_fdset_thread);
}
}
close_cr_fdset(&cr_fdset); close_cr_fdset(&cr_fdset);
if (opts->leader_only) if (opts->leader_only)
@@ -1198,7 +1213,6 @@ err:
free_pstree(&pstree_list); free_pstree(&pstree_list);
close_cr_fdset(&cr_fdset); close_cr_fdset(&cr_fdset);
close_cr_fdset(&cr_fdset_thread);
return ret; return ret;
} }