---

yaml
---
r: 14055
b: refs/heads/try
c: 9fa950e
h: refs/heads/master
i:
  14053: faf934e
  14051: d7e7376
  14047: 52a3e5d
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: 21d783c33844028d8baa0d4d022fc244fc3ba77b
+refs/heads/try: 9fa950ec53dc7428d2d4a20ba56a50c21d5606a5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_kernel.cpp

@@ -84,25 +84,27 @@ rust_kernel::fail() {
 
 void
 rust_kernel::register_task(rust_task *task) {
+    int new_live_tasks;
     {
         scoped_lock with(task_lock);
         task->user.id = max_task_id++;
         task_table.put(task->user.id, task);
+        new_live_tasks = ++live_tasks;
     }
     K(srv, task->user.id != INTPTR_MAX, "Hit the maximum task id");
     KLOG_("Registered task %" PRIdPTR, task->user.id);
-    int new_live_tasks = sync::increment(live_tasks);
     KLOG_("Total outstanding tasks: %d", new_live_tasks);
 }
 
 void
 rust_kernel::release_task_id(rust_task_id id) {
     KLOG_("Releasing task %" PRIdPTR, id);
+    int new_live_tasks;
     {
         scoped_lock with(task_lock);
         task_table.remove(id);
+        new_live_tasks = --live_tasks;
     }
-    int new_live_tasks = sync::decrement(live_tasks);
     KLOG_("Total outstanding tasks: %d", new_live_tasks);
     if (new_live_tasks == 0) {
         // There are no more tasks and there never will be.

branches/try/src/rt/rust_kernel.h

@@ -22,12 +22,13 @@ class rust_kernel {
 private:
     rust_scheduler *sched;
 
+    // Protects live_tasks, 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.
-    volatile int live_tasks;
-    // Protects max_task_id and task_table
-    lock_and_signal task_lock;
+    int live_tasks;
+    // The next task id
     rust_task_id max_task_id;
     hash_map<rust_task_id, rust_task *> task_table;