---

yaml
---
r: 4090
b: refs/heads/master
c: 57459ec
h: refs/heads/master
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8878b128baddfa4ee38e4f9c43be75abe0edcd3d
+refs/heads/master: 57459ec8ae402be358393455533cdf363866cdca

trunk/src/rt/rust_chan.cpp

@@ -32,6 +32,7 @@ rust_chan::~rust_chan() {
 void rust_chan::associate(maybe_proxy<rust_port> *port) {
     this->port = port;
     if (port->is_proxy() == false) {
+        scoped_lock with(port->referent()->lock);
         DLOG(kernel->sched, task,
             "associating chan: 0x%" PRIxPTR " with port: 0x%" PRIxPTR,
             this, port);
@@ -54,6 +55,7 @@ void rust_chan::disassociate() {
       "Channel must be associated with a port.");
 
     if (port->is_proxy() == false) {
+        scoped_lock with(port->referent()->lock);
         DLOG(kernel->sched, task,
             "disassociating chan: 0x%" PRIxPTR " from port: 0x%" PRIxPTR,
             this, port->referent());