---

yaml
---
r: 11636
b: refs/heads/master
c: d7298a7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8a4c8bab8486592b2606afb275ad62974ed89767
+refs/heads/master: d7298a797b1041e9e997378bdb3cd4923567b2d4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_task.cpp

@@ -155,9 +155,12 @@ cleanup_task(cleanup_args *args) {
 
     task->die();
 
-    if (task->killed && !threw_exception) {
-        LOG(task, task, "Task killed during termination");
-        threw_exception = true;
+    {
+        scoped_lock with(task->kill_lock);
+        if (task->killed && !threw_exception) {
+            LOG(task, task, "Task killed during termination");
+            threw_exception = true;
+        }
     }
 
     task->notify(!threw_exception);
@@ -244,6 +247,7 @@ void rust_task::start()
 
 bool
 rust_task::must_fail_from_being_killed() {
+    scoped_lock with(kill_lock);
     return killed && !reentered_rust_stack;
 }
 
@@ -275,7 +279,10 @@ rust_task::kill() {
     // If you want to fail yourself you do self->fail().
     LOG(this, task, "killing task %s @0x%" PRIxPTR, name, this);
     // When the task next goes to yield or resume it will fail
-    killed = true;
+    {
+        scoped_lock with(kill_lock);
+        killed = true;
+    }
     // Unblock the task so it can unwind.
     unblock();
 

trunk/src/rt/rust_task.h

@@ -107,6 +107,8 @@ rust_task : public kernel_owned<rust_task>, rust_cond
 
 private:
 
+    // Protects the killed flag
+    lock_and_signal kill_lock;
     // Indicates that the task was killed and needs to unwind
     bool killed;
     // Indicates that we've called back into Rust from C