Skip to content

C
criu
Commit 15b39a1d authored by Pavel Emelyanov's avatar Pavel Emelyanov
Browse files
Options

pstree: Use task_alive() instead of switch()-es 

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 54862513
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 17 deletions
cr-restore.c
View file @ 15b39a1d
...@@ -895,21 +895,15 @@ static int restore_one_task(int pid, CoreEntry *core) ...@@ -895,21 +895,15 @@ static int restore_one_task(int pid, CoreEntry *core)
/* No more fork()-s => no more per-pid logs */ /* No more fork()-s => no more per-pid logs */
switch (current->state) { if (task_alive(current))
case TASK_ALIVE:
case TASK_STOPPED:
ret = restore_one_alive_task(pid, core); ret = restore_one_alive_task(pid, core);
break; else if (current->state == TASK_DEAD)
case TASK_DEAD:
ret = restore_one_zombie(pid, core); ret = restore_one_zombie(pid, core);
break; else if (current->state == TASK_HELPER)
case TASK_HELPER:
ret = 0; ret = 0;
break; else {
default:
pr_err("Unknown state in code %d\n", (int)core->tc->task_state); pr_err("Unknown state in code %d\n", (int)core->tc->task_state);
ret = -1; ret = -1;
break;
} }
if (core) if (core)
...@@ -951,14 +945,9 @@ static inline int fork_with_pid(struct pstree_item *item) ...@@ -951,14 +945,9 @@ static inline int fork_with_pid(struct pstree_item *item)
item->state = ca.core->tc->task_state; item->state = ca.core->tc->task_state;
item->rst->cg_set = ca.core->tc->cg_set; item->rst->cg_set = ca.core->tc->cg_set;
switch (item->state) { if (item->state == TASK_DEAD)
case TASK_ALIVE:
case TASK_STOPPED:
break;
case TASK_DEAD:
item->parent->rst->nr_zombies++; item->parent->rst->nr_zombies++;
break; else if (!task_alive(item)) {
default:
pr_err("Unknown task state %d\n", item->state); pr_err("Unknown task state %d\n", item->state);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment