From e3ccac8ed3b447ffecfbba7402760c083b9e51e2 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 3 Mar 2012 02:44:56 -0800
Subject: [PATCH] rt: Renome rust_task::lock to port_lock

---
 src/rt/rust_builtin.cpp       |  4 ++--
 src/rt/rust_port.cpp          |  4 ++--
 src/rt/rust_port_selector.cpp |  2 +-
 src/rt/rust_task.cpp          | 14 +++++++-------
 src/rt/rust_task.h            |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 2a210a7fb54e..dcf01e4420e5 100644
--- a/src/rt/rust_builtin.cpp
+++ b/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 {
diff --git a/src/rt/rust_port.cpp b/src/rt/rust_port.cpp
index 5f46b9c4ca0a..97fe6a892c8c 100644
--- a/src/rt/rust_port.cpp
+++ b/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);
     }
diff --git a/src/rt/rust_port_selector.cpp b/src/rt/rust_port_selector.cpp
index 610db6ce9277..1e1b09a59c58 100644
--- a/src/rt/rust_port_selector.cpp
+++ b/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());
 
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 2c810abdeacf..f2f3fa21c3e8 100644
--- a/src/rt/rust_task.cpp
+++ b/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();
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 4f1ae792ae2e..328b5c5ca9ed 100644
--- a/src/rt/rust_task.h
+++ b/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;