---

yaml
---
r: 4453
b: refs/heads/master
c: b62e80c
h: refs/heads/master
i:
  4451: cbe9b8b
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 200bbcf91b4eb190cff227127cc60a333f9c33a2
+refs/heads/master: b62e80c1f022131da963da84ef6768f300c2c5c3

trunk/src/comp/back/upcall.rs

@@ -36,6 +36,8 @@ type upcalls =
      del_port: ValueRef,
      new_chan: ValueRef,
      flush_chan: ValueRef,
+     drop_chan: ValueRef,
+     take_chan: ValueRef,
      del_chan: ValueRef,
      clone_chan: ValueRef,
      chan_target_task: ValueRef,
@@ -94,6 +96,8 @@ fn declare_upcalls(tn: type_names, tydesc_type: TypeRef,
           new_chan:
               d("new_chan", ~[T_opaque_port_ptr()], T_opaque_chan_ptr()),
           flush_chan: dv("flush_chan", ~[T_opaque_chan_ptr()]),
+          drop_chan: dv("drop_chan", ~[T_opaque_chan_ptr()]),
+          take_chan: dv("take_chan", ~[T_opaque_chan_ptr()]),
           del_chan: dv("del_chan", ~[T_opaque_chan_ptr()]),
           clone_chan:
               d("clone_chan", ~[taskptr_type, T_opaque_chan_ptr()],

trunk/src/comp/middle/trans.rs

@@ -1237,6 +1237,12 @@ fn make_copy_glue(cx: &@block_ctxt, v: ValueRef, t: &ty::t) {
         cx.build.Call(bcx_ccx(cx).upcalls.take_task,
                       ~[cx.fcx.lltaskptr, task_ptr]);
         bcx = cx;
+    } else if ty::type_is_chan(bcx_tcx(cx), t) {
+        let ptr = cx.build.Load(v);
+        ptr = cx.build.PointerCast(ptr, T_opaque_chan_ptr());
+        cx.build.Call(bcx_ccx(cx).upcalls.take_chan,
+                      ~[cx.fcx.lltaskptr, ptr]);
+        bcx = cx;
     } else if ty::type_is_boxed(bcx_tcx(cx), t) {
         bcx = incr_refcnt_of_boxed(cx, cx.build.Load(v)).bcx;
     } else if (ty::type_is_structural(bcx_tcx(cx), t)) {
@@ -1395,7 +1401,13 @@ fn make_drop_glue(cx: &@block_ctxt, v0: ValueRef, t: &ty::t) {
           }
           ty::ty_box(_) { decr_refcnt_maybe_free(cx, v0, v0, t) }
           ty::ty_port(_) { decr_refcnt_maybe_free(cx, v0, v0, t) }
-          ty::ty_chan(_) { decr_refcnt_maybe_free(cx, v0, v0, t) }
+          ty::ty_chan(_) {
+            let ptr = cx.build.Load(v0);
+            ptr = cx.build.PointerCast(ptr, T_opaque_chan_ptr());
+            {bcx: cx,
+             val: cx.build.Call(bcx_ccx(cx).upcalls.drop_chan,
+                                ~[cx.fcx.lltaskptr, ptr])}
+          }
           ty::ty_task. {
             let task_ptr = cx.build.Load(v0);
             {bcx: cx,

trunk/src/rt/memory_region.cpp

@@ -4,7 +4,7 @@
 // NB: please do not commit code with this uncommented. It's
 // hugely expensive and should only be used as a last resort.
 //
-//#define TRACK_ALLOCATIONS
+// #define TRACK_ALLOCATIONS
 
 #define MAGIC 0xbadc0ffe
 

trunk/src/rt/rust_builtin.cpp

@@ -904,9 +904,14 @@ void del_chan(rust_task *task, rust_chan *chan) {
     chan->destroy();
 }
 
+extern "C" CDECL
+void take_chan(rust_task *task, rust_chan *chan) {
+    chan->ref();
+}
+
 extern "C" CDECL
 void drop_chan(rust_task *task, rust_chan *chan) {
-    chan->ref_count--;
+    chan->deref();
 }
 
 extern "C" CDECL

trunk/src/rt/rust_chan.cpp

@@ -22,6 +22,8 @@ rust_chan::~rust_chan() {
     KLOG(kernel, comm, "del rust_chan(task=0x%" PRIxPTR ")",
          (uintptr_t) this);
 
+    this->destroy();
+
     A(kernel, is_associated() == false,
       "Channel must be disassociated before being freed.");
 }
@@ -35,7 +37,7 @@ void rust_chan::associate(rust_port *port) {
     KLOG(kernel, task,
          "associating chan: 0x%" PRIxPTR " with port: 0x%" PRIxPTR,
          this, port);
-    ++this->ref_count;
+    this->ref();
     this->task = port->task;
     this->task->ref();
     this->port->chans.push(this);
@@ -57,13 +59,14 @@ void rust_chan::disassociate() {
     KLOG(kernel, task,
          "disassociating chan: 0x%" PRIxPTR " from port: 0x%" PRIxPTR,
          this, port);
-    --this->ref_count;
     task->deref();
     this->task = NULL;
     port->chans.swap_delete(this);
 
     // Delete reference to the port.
     port = NULL;
+
+    this->deref();
 }
 
 /**
@@ -101,9 +104,6 @@ rust_chan *rust_chan::clone(rust_task *target) {
  * appear to be live, causing modify-after-free errors.
  */
 void rust_chan::destroy() {
-    A(kernel, ref_count == 0,
-      "Channel's ref count should be zero.");
-
     if (is_associated()) {
         // We're trying to delete a channel that another task may be
         // reading from. We have two options:
@@ -121,7 +121,6 @@ void rust_chan::destroy() {
         scoped_lock with(port->lock);
         disassociate();
     }
-    delete this;
 }
 
 //

trunk/src/rt/rust_chan.h

@@ -3,13 +3,13 @@
 
 class rust_chan : public kernel_owned<rust_chan>,
                   public rust_cond {
+    ~rust_chan();
+
 public:
-    RUST_REFCOUNTED_WITH_DTOR(rust_chan, destroy())
+    RUST_ATOMIC_REFCOUNT();
     rust_chan(rust_kernel *kernel, rust_port *port,
               size_t unit_sz);
 
-    ~rust_chan();
-
     rust_kernel *kernel;
     rust_task *task;
     rust_port *port;

trunk/src/rt/rust_internal.h

@@ -108,6 +108,13 @@ static size_t const BUF_BYTES = 2048;
   void ref() { ++ref_count; } \
   void deref() { if (--ref_count == 0) { dtor; } }
 
+#define RUST_ATOMIC_REFCOUNT()                                          \
+    private:                                                            \
+    intptr_t ref_count;                                                 \
+public:                                                                 \
+ void ref() { sync::increment(ref_count); }                             \
+ void deref() { if(0 == sync::decrement(ref_count)) { delete this; } }
+
 template <typename T> struct rc_base {
     RUST_REFCOUNTED(T)
 

trunk/src/rt/rust_port.cpp

@@ -8,10 +8,6 @@ rust_port::rust_port(rust_task *task, size_t unit_sz)
     LOG(task, comm,
         "new rust_port(task=0x%" PRIxPTR ", unit_sz=%d) -> port=0x%"
         PRIxPTR, (uintptr_t)task, unit_sz, (uintptr_t)this);
-
-    // Allocate a remote channel, for remote channel data.
-    remote_channel = new (kernel, "remote chan")
-        rust_chan(kernel, this, unit_sz);
 }
 
 rust_port::~rust_port() {
@@ -22,15 +18,7 @@ rust_port::~rust_port() {
         scoped_lock with(lock);
         rust_chan *chan = chans.peek();
         chan->disassociate();
-
-        if (chan->ref_count == 0) {
-            LOG(task, comm,
-                "chan: 0x%" PRIxPTR " is dormant, freeing", chan);
-            delete chan;
-        }
     }
-
-    delete remote_channel;
 }
 
 bool rust_port::receive(void *dptr) {
@@ -52,10 +40,9 @@ void rust_port::log_state() {
     for (uint32_t i = 0; i < chans.length(); i++) {
         rust_chan *chan = chans[i];
         LOG(task, comm,
-            "\tchan: 0x%" PRIxPTR ", size: %d, remote: %s",
+            "\tchan: 0x%" PRIxPTR ", size: %d",
             chan,
-            chan->buffer.size(),
-            chan == remote_channel ? "yes" : "no");
+            chan->buffer.size());
     }
 }
 

trunk/src/rt/rust_port.h

@@ -12,9 +12,6 @@ class rust_port : public kernel_owned<rust_port>, public rust_cond {
     ptr_vec<rust_token> writers;
     ptr_vec<rust_chan> chans;
 
-    // Data sent to this port from remote tasks is buffered in this channel.
-    rust_chan *remote_channel;
-
     lock_and_signal lock;
 
     rust_port(rust_task *task, size_t unit_sz);

trunk/src/rt/rust_task.h

@@ -38,14 +38,7 @@ struct gc_alloc {
 struct
 rust_task : public kernel_owned<rust_task>, rust_cond
 {
-    // This block could be pulled out into something like a
-    // RUST_ATOMIC_REFCOUNTED macro.
-private:
-    intptr_t ref_count;
-public:
-    void ref() { sync::increment(ref_count); }
-    void deref() { if(0 == sync::decrement(ref_count)) { delete this; } }
-
+    RUST_ATOMIC_REFCOUNT();
 
     // Fields known to the compiler.
     stk_seg *stk;

trunk/src/rt/rust_upcall.cpp

@@ -508,6 +508,22 @@ upcall_drop_task(rust_task *task, rust_task *target) {
     }
 }
 
+extern "C" CDECL void
+upcall_take_chan(rust_task *task, rust_chan *target) {
+    LOG_UPCALL_ENTRY(task);
+    if(target) {
+        target->ref();
+    }
+}
+
+extern "C" CDECL void
+upcall_drop_chan(rust_task *task, rust_chan *target) {
+    LOG_UPCALL_ENTRY(task);
+    if(target) {
+        target->deref();
+    }
+}
+
 extern "C" CDECL rust_task *
 upcall_start_task(rust_task *spawner,
                   rust_task *task,

trunk/src/rt/rustrt.def.in

@@ -69,6 +69,7 @@ str_from_vec
 str_push_byte
 str_slice
 str_vec
+take_chan
 task_sleep
 task_yield
 task_join
@@ -78,6 +79,7 @@ upcall_chan_target_task
 upcall_clone_chan
 upcall_del_chan
 upcall_del_port
+upcall_drop_chan
 upcall_drop_task
 upcall_dup_str
 upcall_exit
@@ -108,6 +110,7 @@ upcall_shared_free
 upcall_sleep
 upcall_start_task
 upcall_take_task
+upcall_take_chan
 upcall_trace_str
 upcall_trace_word
 upcall_vec_append