From b51f5c395cc3458e428159b908ca95b1777e66e2 Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Sat, 23 Jul 2011 14:01:43 -0700 Subject: Made root_task no longer special. --- src/rt/rust_task.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/rt/rust_task.cpp') diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index af55208582e..de6b00acb3f 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -103,8 +103,8 @@ rust_task::~rust_task() /* FIXME: tighten this up, there are some more assertions that hold at task-lifecycle events. */ - I(sched, ref_count == 0 || - (ref_count == 1 && this == sched->root_task)); + // I(sched, ref_count == 0 || + // (ref_count == 1 && this == sched->root_task)); del_stk(this, stk); } @@ -207,8 +207,8 @@ rust_task::kill() { // Unblock the task so it can unwind. unblock(); - if (this == sched->root_task) - sched->fail(); + // if (this == sched->root_task) + // sched->fail(); LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this); // run_on_resume(rust_unwind_glue); @@ -229,8 +229,6 @@ rust_task::fail() { supervisor->kill(); } // FIXME: implement unwinding again. - if (this == sched->root_task) - sched->fail(); failed = true; } -- cgit 1.4.1-3-g733a5