---

yaml
---
r: 11643
b: refs/heads/master
c: e3ccac8
h: refs/heads/master
i:
  11641: 83f7c8a
  11639: 464c8af
v: v3

Author: brson

[refs]

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

trunk/src/rt/rust_builtin.cpp

@@ -489,7 +489,7 @@ rust_port_detach(rust_port *port) {
     // FIXME: Busy waiting until we're the only ref
     bool done = false;
     while (!done) {
-        scoped_lock with(task->lock);
+        scoped_lock with(task->port_lock);
         done = port->ref_count == 1;
     }
 }
@@ -528,7 +528,7 @@ chan_id_send(type_desc *t, rust_task_id target_task_id,
         rust_port *port = target_task->get_port_by_id(target_port_id);
         if(port) {
             port->send(sptr);
-            scoped_lock with(target_task->lock);
+            scoped_lock with(target_task->port_lock);
             port->deref();
             sent = true;
         } else {

trunk/src/rt/rust_port.cpp

@@ -21,8 +21,8 @@ rust_port::~rust_port() {
 }
 
 void rust_port::detach() {
-    I(task->thread, !task->lock.lock_held_by_current_thread());
-    scoped_lock with(task->lock);
+    I(task->thread, !task->port_lock.lock_held_by_current_thread());
+    scoped_lock with(task->port_lock);
     {
         task->release_port(id);
     }

trunk/src/rt/rust_port_selector.cpp

@@ -63,7 +63,7 @@ void
 rust_port_selector::msg_sent_on(rust_port *port) {
     rust_task *task = port->task;
 
-    I(task->thread, !task->lock.lock_held_by_current_thread());
+    I(task->thread, !task->port_lock.lock_held_by_current_thread());
     I(task->thread, !port->lock.lock_held_by_current_thread());
     I(task->thread, !rendezvous_lock.lock_held_by_current_thread());
 

trunk/src/rt/rust_task.cpp

@@ -108,7 +108,7 @@ void
 rust_task::delete_this()
 {
     {
-        scoped_lock with (lock);
+        scoped_lock with (port_lock);
         I(thread, port_table.is_empty());
     }
 
@@ -471,8 +471,8 @@ rust_task::calloc(size_t size, const char *tag) {
 }
 
 rust_port_id rust_task::register_port(rust_port *port) {
-    I(thread, !lock.lock_held_by_current_thread());
-    scoped_lock with(lock);
+    I(thread, !port_lock.lock_held_by_current_thread());
+    scoped_lock with(port_lock);
 
     rust_port_id id = next_port_id++;
     A(thread, id != INTPTR_MAX, "Hit the maximum port id");
@@ -481,13 +481,13 @@ rust_port_id rust_task::register_port(rust_port *port) {
 }
 
 void rust_task::release_port(rust_port_id id) {
-    I(thread, lock.lock_held_by_current_thread());
+    I(thread, port_lock.lock_held_by_current_thread());
     port_table.remove(id);
 }
 
 rust_port *rust_task::get_port_by_id(rust_port_id id) {
-    I(thread, !lock.lock_held_by_current_thread());
-    scoped_lock with(lock);
+    I(thread, !port_lock.lock_held_by_current_thread());
+    scoped_lock with(port_lock);
     rust_port *port = NULL;
     port_table.get(id, &port);
     if (port) {
@@ -510,7 +510,7 @@ rust_task::notify(bool success) {
                 msg.result = !success ? tr_failure : tr_success;
 
                 target_port->send(&msg);
-                scoped_lock with(target_task->lock);
+                scoped_lock with(target_task->port_lock);
                 target_port->deref();
             }
             target_task->deref();

trunk/src/rt/rust_task.h

@@ -89,8 +89,8 @@ rust_task : public kernel_owned<rust_task>, rust_cond
 
     bool propagate_failure;
 
-    lock_and_signal lock;
-
+    // Protects port_table
+    lock_and_signal port_lock;
     hash_map<rust_port_id, rust_port *> port_table;
 
     rust_obstack dynastack;