---

yaml
---
r: 10987
b: refs/heads/master
c: 3978fbf
h: refs/heads/master
i:
  10985: f19f715
  10983: b59505a
v: v3

Author: brson

[refs]

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

trunk/src/rt/rust_scheduler.cpp

@@ -135,16 +135,10 @@ rust_scheduler::reap_dead_tasks(int id) {
     for (size_t i = 0; i < dead_tasks_len; ++i) {
         rust_task *task = dead_tasks_copy[i];
         task->lock.lock();
-        // Make sure this task isn't still running somewhere else...
-        if (task->can_schedule(id)) {
-            DLOG(this, task,
-                "deleting unreferenced dead task %s @0x%" PRIxPTR,
-                task->name, task);
-            task->lock.unlock();
-        } else {
-            task->lock.unlock();
-            dead_tasks_copy[i] = NULL;
-        }
+        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
@@ -192,9 +186,7 @@ rust_scheduler::schedule_task(int id) {
         // Look around for a runnable task, starting at k.
         for(size_t j = 0; j < running_tasks.length(); ++j) {
             size_t  i = (j + k) % running_tasks.length();
-            if (running_tasks[i]->can_schedule(id)) {
-                return (rust_task *)running_tasks[i];
-            }
+            return (rust_task *)running_tasks[i];
         }
     }
     return NULL;

trunk/src/rt/rust_task.cpp

@@ -623,11 +623,6 @@ rust_task::backtrace() {
 #endif
 }
 
-bool rust_task::can_schedule(int id)
-{
-    return true;
-}
-
 void *
 rust_task::calloc(size_t size, const char *tag) {
     return local_region.calloc(size, tag);

trunk/src/rt/rust_task.h

@@ -171,8 +171,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     frame_glue_fns *get_frame_glue_fns(uintptr_t fp);
     rust_crate_cache * get_crate_cache();
 
-    bool can_schedule(int worker);
-
     void *calloc(size_t size, const char *tag);
 
     rust_port_id register_port(rust_port *port);