Re-enabled join.

2011-06-13 18:19:08 -07:00
parent 1fa9133b76
commit c4f9bd9470
4 changed files with 26 additions and 5 deletions
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -361,7 +361,12 @@ task_yield(rust_task *task) {

 extern "C" CDECL void
 task_join(rust_task *task, rust_task *join_task) {
-    // TODO
+    // If the other task is already dying, we don't have to wait for it.
+    if (join_task->dead() == false) {
+        join_task->tasks_waiting_to_join.push(task);
+        task->block(join_task, "joining local task");
+        task->yield(2);
+    }
 }

 /* Debug builtins for std.dbg. */