about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-03-01 14:53:10 -0800
committerBrian Anderson <banderson@mozilla.com>2012-03-01 14:53:20 -0800
commit5df44bd06669bef20959572a7c6a5b18759bec44 (patch)
tree3b5c5e166d8eb8054a27b3af4352cb8775ef1e47
parent3cec2d695431d6b5a3b8756f851935c2f8120f04 (diff)
downloadrust-5df44bd06669bef20959572a7c6a5b18759bec44.tar.gz
rust-5df44bd06669bef20959572a7c6a5b18759bec44.zip
rt: Remove rust_kernel::live_tasks. Unused
-rw-r--r--src/rt/rust_kernel.cpp5
-rw-r--r--src/rt/rust_kernel.h6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp
index c953cabbe86..b0c93c315ed 100644
--- a/src/rt/rust_kernel.cpp
+++ b/src/rt/rust_kernel.cpp
@@ -17,7 +17,6 @@ rust_kernel::rust_kernel(rust_srv *srv) :
     _region(srv, true),
     _log(srv, NULL),
     srv(srv),
-    live_tasks(0),
     max_task_id(0),
     rval(0),
     max_sched_id(0),
@@ -173,7 +172,7 @@ rust_kernel::register_task(rust_task *task) {
         scoped_lock with(task_lock);
         task->id = max_task_id++;
         task_table.put(task->id, task);
-        new_live_tasks = ++live_tasks;
+        new_live_tasks = task_table.count();
     }
     K(srv, task->id != INTPTR_MAX, "Hit the maximum task id");
     KLOG_("Registered task %" PRIdPTR, task->id);
@@ -187,7 +186,7 @@ rust_kernel::release_task_id(rust_task_id id) {
     {
         scoped_lock with(task_lock);
         task_table.remove(id);
-        new_live_tasks = --live_tasks;
+        new_live_tasks = task_table.count();
     }
     KLOG_("Total outstanding tasks: %d", new_live_tasks);
 }
diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h
index 8e994ea71ec..626e73f63d0 100644
--- a/src/rt/rust_kernel.h
+++ b/src/rt/rust_kernel.h
@@ -24,12 +24,8 @@ class rust_kernel {
 public:
     rust_srv *srv;
 private:
-    // Protects live_tasks, max_task_id and task_table
+    // Protects max_task_id and task_table
     lock_and_signal task_lock;
-    // Tracks the number of tasks that are being managed by
-    // schedulers. When this hits 0 we will tell all schedulers
-    // to exit.
-    uintptr_t live_tasks;
     // The next task id
     rust_task_id max_task_id;
     hash_map<rust_task_id, rust_task *> task_table;