---

yaml
---
r: 14572
b: refs/heads/try
c: 5df44bd
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3cec2d695431d6b5a3b8756f851935c2f8120f04
+refs/heads/try: 5df44bd06669bef20959572a7c6a5b18759bec44
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/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);
 }

branches/try/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;