---

yaml
---
r: 11967
b: refs/heads/master
c: 47c1895
h: refs/heads/master
i:
  11965: 229c118
  11963: 443e353
  11959: ff58b7b
  11951: 600ec4f
  11935: 1e68a20
  11903: a7c1af8
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 05466c61380366cfd1969bb9f4eb26cff2acaedd
+refs/heads/master: 47c18957242e34ddb8b12f27c8efd396171fef6d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_task_list.cpp

@@ -1,12 +1,12 @@
 #include "rust_internal.h"
 
-rust_task_list::rust_task_list (rust_task_thread *thread, const char* name) :
-    thread(thread), name(name) {
+rust_task_list::rust_task_list (rust_task_thread *thread) :
+    thread(thread) {
 }
 
 void
 rust_task_list::delete_all() {
-    DLOG(thread, task, "deleting all %s tasks", name);
+    DLOG(thread, task, "deleting all tasks");
     while (is_empty() == false) {
         rust_task *task = pop_value();
         DLOG(thread, task, "deleting task " PTR, task);

trunk/src/rt/rust_task_list.h

@@ -9,8 +9,7 @@ class rust_task_list : public indexed_list<rust_task>,
                        public kernel_owned<rust_task_list> {
 public:
     rust_task_thread *thread;
-    const char* name;
-    rust_task_list (rust_task_thread *thread, const char* name);
+    rust_task_list (rust_task_thread *thread);
     void delete_all();
 };
 

trunk/src/rt/rust_task_thread.cpp

@@ -27,10 +27,10 @@ rust_task_thread::rust_task_thread(rust_scheduler *sched,
     id(id),
     should_exit(false),
     cached_c_stack(NULL),
-    newborn_tasks(this, "newborn"),
-    running_tasks(this, "running"),
-    blocked_tasks(this, "blocked"),
-    dead_tasks(this, "dead"),
+    newborn_tasks(this),
+    running_tasks(this),
+    blocked_tasks(this),
+    dead_tasks(this),
     kernel(sched->kernel),
     sched(sched),
     srv(srv),
@@ -248,7 +248,7 @@ rust_task_thread::start_main_loop() {
              ", state: %s",
              scheduled_task->name,
              (uintptr_t)scheduled_task,
-             state_list(scheduled_task->get_state())->name);
+             state_name(scheduled_task->get_state()));
 
         place_task_in_tls(scheduled_task);
 
@@ -262,7 +262,7 @@ rust_task_thread::start_main_loop() {
              " in state '%s', worker id=%d" PRIxPTR,
              scheduled_task->name,
              (uintptr_t)scheduled_task,
-             state_list(scheduled_task->get_state())->name,
+             state_name(scheduled_task->get_state()),
              id);
 
         reap_dead_tasks();
@@ -316,20 +316,35 @@ rust_task_thread::state_list(rust_task_state state) {
     }
 }
 
+const char *
+rust_task_thread::state_name(rust_task_state state) {
+    switch (state) {
+    case task_state_newborn:
+        return "newborn";
+    case task_state_running:
+        return "running";
+    case task_state_blocked:
+        return "blocked";
+    case task_state_dead:
+        return "dead";
+    default:
+        assert(false);
+        return "";
+    }
+}
+
 void 
 rust_task_thread::transition(rust_task *task,
                              rust_task_state src, rust_task_state dst,
                              rust_cond *cond, const char* cond_name) {
     scoped_lock with(lock);
-    rust_task_list *src_list = state_list(src);
-    rust_task_list *dst_list = state_list(dst);
     DLOG(this, task,
          "task %s " PTR " state change '%s' -> '%s' while in '%s'",
-         name, (uintptr_t)this, src_list->name, dst_list->name,
-         state_list(task->get_state())->name);
+         name, (uintptr_t)this, state_name(src), state_name(dst),
+         state_name(task->get_state()));
     I(this, task->get_state() == src);
-    src_list->remove(task);
-    dst_list->append(task);
+    state_list(src)->remove(task);
+    state_list(dst)->append(task);
     task->set_state(dst, cond, cond_name);
 
     lock.signal();

trunk/src/rt/rust_task_thread.h

@@ -54,6 +54,7 @@ struct rust_task_thread : public kernel_owned<rust_task_thread>,
     void unprepare_c_stack();
 
     rust_task_list *state_list(rust_task_state state);
+    const char *state_name(rust_task_state state);
 
 public:
     rust_kernel *kernel;