---

yaml
---
r: 6395
b: refs/heads/master
c: 9393131
h: refs/heads/master
i:
  6393: 2c028fd
  6391: 2c2b3a6
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfa1410d3bbe6eb30e2e97b8eeb2b403ac25660
+refs/heads/master: 93931311ff1d034ef92e35f36c900bbd74176179

trunk/src/rt/rust_task.cpp

@@ -278,6 +278,10 @@ rust_task::yield(size_t time_in_us) {
         unblock();
         fail();
     }
+
+    // FIXME: If we are blocked, and get killed right here then we may never
+    // know it.
+
     yield_timer.reset_us(time_in_us);
 
     // Return to the scheduler.
@@ -468,8 +472,11 @@ rust_task::die() {
 
 void
 rust_task::unblock() {
-    if (blocked())
+    if (blocked()) {
+        // FIXME: What if another thread unblocks the task between when
+        // we checked and here?
         wakeup(cond);
+    }
 }
 
 rust_crate_cache *