---

yaml
---
r: 6268
b: refs/heads/master
c: 5b9f76e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c74fd1dc772ca67ec4d885152f01e33acad9213c
+refs/heads/master: 5b9f76eb7c53a28ed99d4005645485e24568ce22

trunk/src/lib/comm.rs

@@ -40,7 +40,7 @@ native "cdecl" mod rustrt {
 
     fn chan_id_send<uniq T>(t: *sys::type_desc,
                             target_task: task::task, target_port: port_id,
-                            -data: T);
+                            data: T) -> ctypes::uintptr_t;
 
     fn new_port(unit_sz: uint) -> *rust_port;
     fn del_port(po: *rust_port);
@@ -109,7 +109,11 @@ to it.
 */
 fn send<uniq T>(ch: chan<T>, -data: T) {
     let chan_t(t, p) = ch;
-    rustrt::chan_id_send(sys::get_type_desc::<T>(), t, p, data);
+    let res = rustrt::chan_id_send(sys::get_type_desc::<T>(), t, p, data);
+    if res != 0u unsafe {
+        // Data sent successfully
+        unsafe::leak(data);
+    }
     task::yield();
 }
 

trunk/src/lib/ctypes.rs

@@ -10,3 +10,5 @@ type size_t = uint;
 type ssize_t = int;
 /* Type: uint32_t */
 type uint32_t = u32;
+/* Type: uintptr_t */
+type uintptr_t = uint;

trunk/src/rt/rust_builtin.cpp

@@ -485,10 +485,11 @@ get_port_id(rust_port *port) {
     return port->id;
 }
 
-extern "C" CDECL void
+extern "C" CDECL uintptr_t
 chan_id_send(type_desc *t, rust_task_id target_task_id,
              rust_port_id target_port_id, void *sptr) {
     // FIXME: make sure this is thread-safe
+    bool sent = false;
     rust_task *task = rust_scheduler::get_task();
     rust_task *target_task = task->kernel->get_task_by_id(target_task_id);
     if(target_task) {
@@ -497,9 +498,11 @@ chan_id_send(type_desc *t, rust_task_id target_task_id,
             port->send(sptr);
             scoped_lock with(target_task->lock);
             port->deref();
+            sent = true;
         }
         target_task->deref();
     }
+    return (uintptr_t)sent;
 }
 
 // This is called by an intrinsic on the Rust stack.

trunk/src/test/run-pass/task-comm-chan-cleanup3.rs

@@ -0,0 +1,10 @@
+use std;
+import std::comm;
+
+fn main() {
+    let c = {
+        let p = comm::port();
+        comm::chan(p)
+    };
+    comm::send(c, "coffee");
+}