---

yaml
---
r: 11969
b: refs/heads/master
c: 6f6650e
h: refs/heads/master
i:
  11967: aec07de
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5d4bf75f56a10c4d15acb3ecb3d33aeea5511806
+refs/heads/master: 6f6650e72645dc4eb16696f10f3a047e98722762
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_task_thread.cpp

@@ -255,7 +255,6 @@ rust_task_thread::start_main_loop() {
         reap_dead_tasks();
     }
 
-    A(this, newborn_tasks.is_empty(), "Should have no newborn tasks");
     A(this, running_tasks.is_empty(), "Should have no running tasks");
     A(this, blocked_tasks.is_empty(), "Should have no blocked tasks");
     A(this, dead_tasks.is_empty(), "Should have no dead tasks");
@@ -280,26 +279,21 @@ rust_task_thread::create_task(rust_task *spawner, const char *name,
     DLOG(this, task, "created task: " PTR ", spawner: %s, name: %s",
                         task, spawner ? spawner->name : "null", name);
 
-    {
-        scoped_lock with(lock);
-        newborn_tasks.append(task);
-    }
-
     task->id = kernel->generate_task_id();
     return task;
 }
 
 rust_task_list *
 rust_task_thread::state_list(rust_task_state state) {
     switch (state) {
-    case task_state_newborn:
-        return &newborn_tasks;
     case task_state_running:
         return &running_tasks;
     case task_state_blocked:
         return &blocked_tasks;
     case task_state_dead:
         return &dead_tasks;
+    default:
+        return NULL;
     }
 }
 
@@ -330,8 +324,14 @@ rust_task_thread::transition(rust_task *task,
          name, (uintptr_t)this, state_name(src), state_name(dst),
          state_name(task->get_state()));
     I(this, task->get_state() == src);
-    state_list(src)->remove(task);
-    state_list(dst)->append(task);
+    rust_task_list *src_list = state_list(src);
+    if (src_list) {
+        src_list->remove(task);
+    }
+    rust_task_list *dst_list = state_list(dst);
+    if (dst_list) {
+        dst_list->append(task);
+    }
     task->set_state(dst, cond, cond_name);
 
     lock.signal();

trunk/src/rt/rust_task_thread.h

@@ -47,7 +47,6 @@ struct rust_task_thread : public kernel_owned<rust_task_thread>,
     stk_seg *cached_c_stack;
     stk_seg *extra_c_stack;
 
-    rust_task_list newborn_tasks;
     rust_task_list running_tasks;
     rust_task_list blocked_tasks;
     rust_task_list dead_tasks;