---

yaml
---
r: 11968
b: refs/heads/master
c: 5d4bf75
h: refs/heads/master
v: v3

Author: brson

[refs]

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

trunk/mk/rt.mk

@@ -45,7 +45,6 @@ RUNTIME_CS_$(1) := \
               rt/rust_scheduler.cpp \
               rt/rust_task.cpp \
               rt/rust_stack.cpp \
-              rt/rust_task_list.cpp \
               rt/rust_port.cpp \
               rt/rust_upcall.cpp \
               rt/rust_uv.cpp \
@@ -83,7 +82,6 @@ RUNTIME_HDR_$(1) := rt/globals.h \
                rt/rust_shape.h \
                rt/rust_task.h \
                rt/rust_stack.h \
-               rt/rust_task_list.h \
                rt/rust_log.h \
                rt/rust_port_selector.h \
                rt/circular_buffer.h \

trunk/src/rt/rust_internal.h

@@ -145,8 +145,6 @@ template <typename T> struct region_owned {
     }
 };
 
-#include "rust_task_list.h"
-
 // A cond(ition) is something we can block on. This can be a channel
 // (writing), a port (reading) or a task (waiting).
 

trunk/src/rt/rust_task_list.cpp

@@ -27,10 +27,6 @@ rust_task_thread::rust_task_thread(rust_scheduler *sched,
     id(id),
     should_exit(false),
     cached_c_stack(NULL),
-    newborn_tasks(this),
-    running_tasks(this),
-    blocked_tasks(this),
-    dead_tasks(this),
     kernel(sched->kernel),
     sched(sched),
     srv(srv),
@@ -47,15 +43,6 @@ rust_task_thread::rust_task_thread(rust_scheduler *sched,
         init_tls();
 }
 
-rust_task_thread::~rust_task_thread() {
-    DLOG(this, dom, "~rust_task_thread %s @0x%" PRIxPTR, name, (uintptr_t)this);
-
-    newborn_tasks.delete_all();
-    running_tasks.delete_all();
-    blocked_tasks.delete_all();
-    dead_tasks.delete_all();
-}
-
 void
 rust_task_thread::activate(rust_task *task) {
     task->ctx.next = &c_context;

trunk/src/rt/rust_task_list.h

@@ -19,6 +19,8 @@ enum rust_task_state {
     task_state_dead
 };
 
+typedef indexed_list<rust_task> rust_task_list;
+
 struct rust_task_thread : public kernel_owned<rust_task_thread>,
                         rust_thread
 {
@@ -80,7 +82,6 @@ struct rust_task_thread : public kernel_owned<rust_task_thread>,
     // Only a pointer to 'name' is kept, so it must live as long as this
     // domain.
     rust_task_thread(rust_scheduler *sched, rust_srv *srv, int id);
-    ~rust_task_thread();
     void activate(rust_task *task);
     void log(rust_task *task, uint32_t level, char const *fmt, ...);
     rust_log & get_log();