---

yaml
---
r: 12263
b: refs/heads/master
c: 3654ef0
h: refs/heads/master
i:
  12261: 92296fb
  12259: bdf5865
  12255: cb465f3
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7c1be236a524980b65b01a327e2c55feb6295a52
+refs/heads/master: 3654ef00782cf9708196fd438ee08c751a5b699b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_sched_launcher.cpp

@@ -27,3 +27,11 @@ rust_thread_sched_launcher_factory::create(rust_scheduler *sched, int id) {
     return new(sched->kernel, "rust_thread_sched_launcher")
         rust_thread_sched_launcher(sched, srv, id);
 }
+
+rust_sched_launcher *
+rust_manual_sched_launcher_factory::create(rust_scheduler *sched, int id) {
+    assert(launcher == NULL && "I can only track one sched_launcher");
+    rust_srv *srv = sched->srv->clone();
+    return new(sched->kernel, "rust_manual_sched_launcher")
+        rust_manual_sched_launcher(sched, srv, id);
+}

trunk/src/rt/rust_sched_launcher.h

@@ -55,4 +55,14 @@ class rust_thread_sched_launcher_factory
     virtual rust_sched_launcher *create(rust_scheduler *sched, int id);
 };
 
+class rust_manual_sched_launcher_factory
+    : public rust_sched_launcher_factory {
+private:
+    rust_manual_sched_launcher *launcher;
+public:
+    rust_manual_sched_launcher_factory() : launcher(NULL) { }
+    virtual rust_sched_launcher *create(rust_scheduler *sched, int id);
+    rust_manual_sched_launcher *get_launcher() { return launcher; }
+};
+
 #endif // RUST_SCHED_LAUNCHER_H