diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-04-03 20:29:12 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-04-03 20:30:01 -0700 |
| commit | e325146eb436c4995385d8220ff7ac3a4a5f62ab (patch) | |
| tree | 999875912f33a00906c76f1eac278251bf63658a /src/rt/rust_builtin.cpp | |
| parent | bd97ee65200966e6c3b0fb45de1fc771c3cf5f3f (diff) | |
| parent | 4cf7efc8f7df215b0ff9e3ea15b7890b84db1b51 (diff) | |
| download | rust-e325146eb436c4995385d8220ff7ac3a4a5f62ab.tar.gz rust-e325146eb436c4995385d8220ff7ac3a4a5f62ab.zip | |
Merge remote-tracking branch 'brson/mainthread'
Conflicts: src/rt/rust_kernel.cpp src/rt/rust_scheduler.cpp src/rt/rust_scheduler.h
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 79e1e880f57..0d1b67674a1 100644 --- 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++ |