---

yaml
---
r: 11657
b: refs/heads/master
c: ee991ca
h: refs/heads/master
i:
  11655: 2e9c18f
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 32f7818e7f08c67417720c7883f1400199632766
+refs/heads/master: ee991cae81c644a5f536acb49fff59ec769e61c7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/comm.rs

@@ -44,6 +44,7 @@ native mod rustrt {
     fn del_port(po: *rust_port);
     fn rust_port_begin_detach(po: *rust_port,
                               yield: *ctypes::uintptr_t);
+    fn rust_port_end_detach(po: *rust_port);
     fn get_port_id(po: *rust_port) -> port_id;
     fn rust_port_size(po: *rust_port) -> ctypes::size_t;
     fn port_recv(dptr: *uint, po: *rust_port,
@@ -92,6 +93,7 @@ resource port_ptr<T: send>(po: *rust_port) {
         // in a bogus state.
         task::yield();
     }
+    rustrt::rust_port_end_detach(po);
 
     // Drain the port so that all the still-enqueued items get dropped
     while rustrt::rust_port_size(po) > 0u {

trunk/src/rt/rust_builtin.cpp

@@ -488,12 +488,16 @@ rust_port_begin_detach(rust_port *port, uintptr_t *yield) {
     port->begin_detach(yield);
 }
 
+extern "C" CDECL void
+rust_port_end_detach(rust_port *port) {
+    port->end_detach();
+}
+
 extern "C" CDECL void
 del_port(rust_port *port) {
     rust_task *task = rust_task_thread::get_task();
     LOG(task, comm, "del_port(0x%" PRIxPTR ")", (uintptr_t) port);
     A(task->thread, port->get_ref_count() == 0, "Expected port ref_count == 0");
-    port->end_detach();
     delete port;
 }
 

trunk/src/rt/rust_port.cpp

@@ -44,6 +44,10 @@ void rust_port::begin_detach(uintptr_t *yield) {
 }
 
 void rust_port::end_detach() {
+    // FIXME: For some reason we can sometimes get here without the
+    // refcount decreasing to 0. This is definitely a bug
+    while (get_ref_count() != 0) { }
+
     // Just take the lock to make sure that the thread that signaled
     // the detach_cond isn't still holding it
     scoped_lock with(detach_lock);

trunk/src/rt/rustrt.def.in

@@ -35,6 +35,7 @@ rust_list_files
 rust_log_console_on
 rust_log_console_off
 rust_port_begin_detach
+rust_port_end_detach
 rust_port_size
 rust_process_wait
 rust_ptr_eq