---

yaml
---
r: 13992
b: refs/heads/try
c: ed3a5ad
h: refs/heads/master
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: 57cad613538177e06aa1b509f820f6f93704ad8c
+refs/heads/try: ed3a5ad5ad01a7213cecb6361b83d710f8eb4249
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_scheduler.cpp

@@ -282,9 +282,7 @@ rust_scheduler::start_main_loop() {
         DLOG(this, task,
              "Running task %p on worker %d",
              scheduled_task, id);
-        scheduled_task->running_on = id;
         activate(scheduled_task);
-        scheduled_task->running_on = -1;
 
         DLOG(this, task,
              "returned from task %s @0x%" PRIxPTR

branches/try/src/rt/rust_task.cpp

@@ -244,7 +244,6 @@ rust_task::rust_task(rust_scheduler *sched, rust_task_list *state,
     list_index(-1),
     next_port_id(0),
     rendezvous_ptr(0),
-    running_on(-1),
     local_region(&sched->srv->local_region),
     boxed(&local_region),
     unwinding(false),
@@ -626,8 +625,7 @@ rust_task::backtrace() {
 
 bool rust_task::can_schedule(int id)
 {
-    return
-        running_on == -1;
+    return true;
 }
 
 void *

branches/try/src/rt/rust_task.h

@@ -98,10 +98,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     // that location before waking us up.
     uintptr_t* rendezvous_ptr;
 
-    // This flag indicates that a worker is either currently running the task
-    // or is about to run this task.
-    int running_on;
-
     memory_region local_region;
     boxed_region boxed;