---

yaml
---
r: 3709
b: refs/heads/master
c: 4739953
h: refs/heads/master
i:
  3707: 63590ab
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d57b25f6b3803ec505ba4909302bebb2cad4afd
+refs/heads/master: 4739953b84b814de3b2b80f273f6292c33e33010

trunk/src/rt/circular_buffer.cpp

@@ -20,6 +20,7 @@ circular_buffer::circular_buffer(rust_task *task, size_t unit_sz) :
          _buffer_sz, _unread, this);
 
     A(sched, _buffer, "Failed to allocate buffer.");
+    task->ref();
 }
 
 circular_buffer::~circular_buffer() {
@@ -28,6 +29,7 @@ circular_buffer::~circular_buffer() {
     W(sched, _unread == 0,
       "freeing circular_buffer with %d unread bytes", _unread);
     task->free(_buffer);
+    --task->ref_count;
 }
 
 size_t

trunk/src/rt/rust_builtin.cpp

@@ -393,11 +393,16 @@ task_yield(rust_task *task) {
 extern "C" CDECL void
 task_join(rust_task *task, rust_task *join_task) {
     // If the other task is already dying, we don't have to wait for it.
+    join_task->lock.lock();
     if (join_task->dead() == false) {
         join_task->tasks_waiting_to_join.push(task);
         task->block(join_task, "joining local task");
+        join_task->lock.unlock();
         task->yield(2);
     }
+    else {
+        join_task->lock.unlock();
+    }
 }
 
 /* Debug builtins for std.dbg. */

trunk/src/rt/rust_task.cpp

@@ -118,12 +118,15 @@ void task_start_wrapper(spawn_args *a)
     a->f(&rval, task, a->a3, a->a4);
 
     LOG(task, task, "task exited with value %d", rval);
+    
 
     LOG(task, task, "task ref_count: %d", task->ref_count);
     A(task->sched, task->ref_count >= 0,
       "Task ref_count should not be negative on exit!");
     task->die();
+    task->lock.lock();
     task->notify_tasks_waiting_to_join();
+    task->lock.unlock();
 
     task->yield(1);
 }