---

yaml
---
r: 8142
b: refs/heads/snap-stage3
c: ad80823
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c76b81cddf7cd7b4aaebbe64bbf8c6565e3ce682
+refs/heads/snap-stage3: ad80823a6ce301e5133e1ba9aff1560f0a9c2886
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_internal.h

@@ -61,6 +61,7 @@ struct stk_seg;
 struct type_desc;
 struct frame_glue_fns;
 
+typedef intptr_t rust_sched_id;
 typedef intptr_t rust_task_id;
 typedef intptr_t rust_port_id;
 

branches/snap-stage3/src/rt/rust_kernel.cpp

@@ -17,7 +17,7 @@ rust_kernel::rust_kernel(rust_srv *srv, size_t num_threads) :
     env(srv->env)
 {
     sched = new (this, "rust_scheduler")
-        rust_scheduler(this, srv, num_threads);
+        rust_scheduler(this, srv, num_threads, 0);
     live_schedulers = 1;
 }
 

branches/snap-stage3/src/rt/rust_scheduler.cpp

@@ -3,12 +3,14 @@
 
 rust_scheduler::rust_scheduler(rust_kernel *kernel,
 			       rust_srv *srv,
-			       size_t num_threads) :
+			       size_t num_threads,
+			       rust_sched_id id) :
     kernel(kernel),
     srv(srv),
     env(srv->env),
     live_threads(num_threads),
-    num_threads(num_threads)
+    num_threads(num_threads),
+    id(id)
 {
     isaac_init(kernel, &rctx);
     create_task_threads();

branches/snap-stage3/src/rt/rust_scheduler.h

@@ -19,14 +19,17 @@ class rust_scheduler : public kernel_owned<rust_scheduler> {
     array_list<rust_task_thread *> threads;
     const size_t num_threads;
 
+    rust_sched_id id;
+
     void create_task_threads();
     void destroy_task_threads();
 
     rust_task_thread *create_task_thread(int id);
     void destroy_task_thread(rust_task_thread *thread);
 
 public:
-    rust_scheduler(rust_kernel *kernel, rust_srv *srv, size_t num_threads);
+    rust_scheduler(rust_kernel *kernel, rust_srv *srv, size_t num_threads,
+		   rust_sched_id id);
     ~rust_scheduler();
 
     void start_task_threads();