---

yaml
---
r: 10988
b: refs/heads/master
c: 5449b88
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3978fbff8b79d53de57d48473bde43aa533369fd
+refs/heads/master: 5449b886d34c1ddbba60986d56d6896543a6b87f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_scheduler.cpp

@@ -288,20 +288,10 @@ rust_scheduler::start_main_loop() {
         reap_dead_tasks(id);
     }
 
-    DLOG(this, dom,
-         "terminated scheduler loop, reaping dead tasks ...");
-
-    while (dead_tasks.length() > 0) {
-        DLOG(this, dom,
-             "waiting for %d dead tasks to become dereferenced, "
-             "scheduler yielding ...",
-             dead_tasks.length());
-        log_state();
-        lock.unlock();
-        sync::yield();
-        lock.lock();
-        reap_dead_tasks(id);
-    }
+    A(this, newborn_tasks.is_empty(), "Should have no newborn tasks");
+    A(this, running_tasks.is_empty(), "Should have no running tasks");
+    A(this, blocked_tasks.is_empty(), "Should have no blocked tasks");
+    A(this, dead_tasks.is_empty(), "Should have no dead tasks");
 
     DLOG(this, dom, "finished main-loop %d", id);