---

yaml
---
r: 10992
b: refs/heads/master
c: 6c632c7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f719ea552bec8eb91a2a02370269eee4404bada7
+refs/heads/master: 6c632c71c6f86752fb626501d5368070e3e37385
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_scheduler.cpp

@@ -123,37 +123,13 @@ rust_scheduler::reap_dead_tasks(int id) {
     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) {
-        rust_task *task = dead_tasks[i];
-        dead_tasks_copy[i] = task;
-    }
-
-    // Now drop the lock and futz with the tasks. This avoids establishing
-    // a sched->lock then task->lock locking order, which would be devestating
-    // to performance.
-    lock.unlock();
-
-    for (size_t i = 0; i < dead_tasks_len; ++i) {
-        rust_task *task = dead_tasks_copy[i];
-        task->lock.lock();
-        DLOG(this, task,
-             "deleting unreferenced dead task %s @0x%" PRIxPTR,
-             task->name, task);
-        task->lock.unlock();
-    }
-
-    // Now grab the lock again and remove the tasks that were truly dead
-    lock.lock();
-
-    for (size_t i = 0; i < dead_tasks_len; ++i) {
-        rust_task *task = dead_tasks_copy[i];
-        if (task) {
-            dead_tasks.remove(task);
-        }
+        dead_tasks_copy[i] = 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 task and sched locks
-    // again (via target->send)
+    // 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.
     lock.unlock();
 
     for (size_t i = 0; i < dead_tasks_len; ++i) {