Merge remote-tracking branch 'brson/mainthread'

Conflicts: src/rt/rust_kernel.cpp src/rt/rust_scheduler.cpp src/rt/rust_scheduler.h
2012-04-03 20:29:12 -07:00
parent bd97ee6520 4cf7efc8f7
commit e325146eb4
11 changed files with 248 additions and 30 deletions
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -640,6 +640,12 @@ rust_dbg_call(dbg_callback cb, void *data) {
    return cb(data);
 }

+extern "C" CDECL rust_sched_id
+rust_osmain_sched_id() {
+    rust_task *task = rust_get_current_task();
+    return task->kernel->osmain_sched_id();
+}
+
 //
 // Local Variables:
 // mode: C++