---

yaml
---
r: 14655
b: refs/heads/try
c: f057f00
h: refs/heads/master
i:
  14653: cd8fb03
  14651: 25be79d
  14647: 13b4fe0
  14639: 31c4c2b
  14623: 8c55a30
  14591: b754f0a
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 8efe4b89137646c5315677b029d4158424c126cc
+refs/heads/try: f057f003009fc84e2e80b3df7673eb9cae7f4810
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task_thread.cpp

@@ -122,33 +122,26 @@ rust_task_thread::number_of_live_tasks() {
 void
 rust_task_thread::reap_dead_tasks() {
     I(this, lock.lock_held_by_current_thread());
+
     if (dead_tasks.length() == 0) {
         return;
     }
 
+    A(this, dead_tasks.length() == 1,
+      "Only one task should die during a single turn of the event loop");
+
     // First make a copy of the dead_task list with the lock held
-    size_t dead_tasks_len = dead_tasks.length();
-    rust_task **dead_tasks_copy = (rust_task**)
-        srv->malloc(sizeof(rust_task*) * dead_tasks_len);
-    for (size_t i = 0; i < dead_tasks_len; ++i) {
-        dead_tasks_copy[i] = dead_tasks.pop_value();
-    }
+    rust_task *dead_task = dead_tasks.pop_value();
 
-    // Now unlock again because we have to actually free the dead tasks,
-    // and that may end up wanting to lock the kernel lock. We have
-    // a kernel lock -> scheduler lock locking order that we need
-    // to maintain.
+    // Dereferencing the task will probably cause it to be released
+    // from the scheduler, which may end up trying to take this lock
     lock.unlock();
 
-    for (size_t i = 0; i < dead_tasks_len; ++i) {
-        rust_task *task = dead_tasks_copy[i];
-        // Release the task from the kernel so nobody else can get at it
-        kernel->release_task_id(task->id);
-        task->delete_all_stacks();
-        // Deref the task, which may cause it to request us to release it
-        task->deref();
-    }
-    srv->free(dead_tasks_copy);
+    // Release the task from the kernel so nobody else can get at it
+    kernel->release_task_id(dead_task->id);
+    dead_task->delete_all_stacks();
+    // Deref the task, which may cause it to request us to release it
+    dead_task->deref();
 
     lock.lock();
 }