Signed-off-by: Matt Helsley <[email protected]>
---
restart.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/restart.c b/restart.c
index d1c2292..b0e87f0 100644
--- a/restart.c
+++ b/restart.c
@@ -207,7 +207,7 @@ struct task {
int children; /* pointers to first child, next and prev */
int next_sib; /* sibling, and the creator of a process */
- struct task *prev_sib;
+ int prev_sib;
struct task *creator;
struct task *phantom; /* pointer to place-holdler task (if any) */
@@ -1208,8 +1208,8 @@ static int ckpt_build_tree(void)
task->creator->pid);
if (task->next_sib > -1)
ckpt_dbg_cont(" next %d",
ctx.tasks_arr[task->next_sib].pid);
- if (task->prev_sib)
- ckpt_dbg_cont(" prev %d", task->prev_sib->pid);
+ if (task->prev_sib > -1)
+ ckpt_dbg_cont(" prev %d",
ctx.tasks_arr[task->prev_sib].pid);
if (task->phantom)
ckpt_dbg_cont(" placeholder %d", task->phantom->pid);
ckpt_dbg_cont(" %c%c%c%c%c%c",
@@ -1249,7 +1249,7 @@ static int ckpt_setup_task(pid_t pid, pid_t ppid)
task->children = -1;
task->next_sib = -1;
- task->prev_sib = NULL;
+ task->prev_sib = -1;
task->creator = NULL;
task->phantom = NULL;
@@ -1386,7 +1386,7 @@ static int ckpt_init_tree(void)
task->children = -1;
task->next_sib = -1;
- task->prev_sib = NULL;
+ task->prev_sib = -1;
task->creator = NULL;
task->phantom = NULL;
@@ -1620,7 +1620,7 @@ static int ckpt_set_creator(struct task *task)
struct task *next = &ctx.tasks_arr[creator->children];
task->next_sib = next->index;
- next->prev_sib = task;
+ next->prev_sib = task->index;
}
ckpt_dbg("pid %d: creator set to %d\n", task->pid, creator->pid);
@@ -1660,7 +1660,7 @@ static int ckpt_placeholder_task(struct task *task)
holder->children = -1;
holder->next_sib = -1;
- holder->prev_sib = NULL;
+ holder->prev_sib = -1;
holder->creator = NULL;
holder->phantom = NULL;
@@ -1669,7 +1669,7 @@ static int ckpt_placeholder_task(struct task *task)
holder->creator = session;
if (session->children > -1) {
holder->next_sib = session->children;
- ctx.tasks_arr[session->children].prev_sib = holder;
+ ctx.tasks_arr[session->children].prev_sib = holder->index;
}
session->children = holder->index;/* = ctx.tasks_nr ?? */
session->phantom = holder;
@@ -1677,14 +1677,14 @@ static int ckpt_placeholder_task(struct task *task)
/* reparent entry if necssary */
if (task->next_sib > -1)
ctx.tasks_arr[task->next_sib].prev_sib = task->prev_sib;
- if (task->prev_sib)
- task->prev_sib->next_sib = task->next_sib;
+ if (task->prev_sib > -1)
+ ctx.tasks_arr[task->prev_sib].next_sib = task->next_sib;
if (task->creator)
task->creator->children = task->next_sib;
task->creator = holder;
task->next_sib = -1;
- task->prev_sib = NULL;
+ task->prev_sib = -1;
return 0;
}
--
1.6.3.3
_______________________________________________
Containers mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/containers
_______________________________________________
Devel mailing list
[email protected]
https://openvz.org/mailman/listinfo/devel
