---

yaml
---
r: 14159
b: refs/heads/try
c: 0667fb4
h: refs/heads/master
i:
  14157: 9a0898b
  14155: 61ace6b
  14151: 27ae7e2
  14143: f7dc0af
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: ae8ea4a78b113f67ade93152dc3dee1ded81a219
+refs/heads/try: 0667fb4e6342a6a18320b464316ae7ba9c2bc192
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_internal.h

@@ -105,8 +105,9 @@ static size_t const BUF_BYTES = 2048;
   void deref() { if (--ref_count == 0) { dtor; } }
 
 #define RUST_ATOMIC_REFCOUNT()                                            \
-public:                                                                   \
+private:                                                                  \
    intptr_t ref_count;                                                    \
+public:                                                                   \
    void ref() {                                                           \
        intptr_t old = sync::increment(ref_count);                         \
        assert(old > 0);                                                   \

branches/try/src/rt/rust_kernel.cpp

@@ -190,6 +190,7 @@ rust_kernel::get_task_by_id(rust_task_id id) {
     task_table.get(id, &task);
     if(task) {
         if(task->get_ref_count() == 0) {
+            // FIXME: I don't think this is possible.
             // this means the destructor is running, since the destructor
             // grabs the kernel lock to unregister the task. Pretend this
             // doesn't actually exist.

branches/try/src/rt/rust_task_thread.cpp

@@ -149,7 +149,7 @@ rust_task_thread::reap_dead_tasks() {
 void
 rust_task_thread::release_task(rust_task *task) {
     // Nobody should have a ref to the task at this point
-    I(this, task->ref_count == 0);
+    I(this, task->get_ref_count() == 0);
     // Kernel should not know about the task any more
     I(this, kernel->get_task_by_id(task->id) == NULL);
     // Now delete the task, which will require using this thread's