---

yaml
---
r: 11645
b: refs/heads/master
c: 8e0efce
h: refs/heads/master
i:
  11643: 51e21c7
v: v3

Author: brson

[refs]

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

trunk/src/rt/rust_builtin.cpp

@@ -486,12 +486,6 @@ rust_port_detach(rust_port *port) {
     rust_task *task = rust_task_thread::get_task();
     LOG(task, comm, "rust_port_detach(0x%" PRIxPTR ")", (uintptr_t) port);
     port->detach();
-    // FIXME: Busy waiting until we're the only ref
-    bool done = false;
-    while (!done) {
-        scoped_lock with(task->port_lock);
-        done = port->ref_count == 1;
-    }
 }
 
 extern "C" CDECL void

trunk/src/rt/rust_port.cpp

@@ -22,6 +22,12 @@ rust_port::~rust_port() {
 
 void rust_port::detach() {
     task->release_port(id);
+    // FIXME: Busy waiting until we're the only ref
+    bool done = false;
+    while (!done) {
+        scoped_lock with(task->port_lock);
+        done = ref_count == 1;
+    }
 }
 
 void rust_port::send(void *sptr) {