about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorEric Holk <eholk@mozilla.com>2011-05-31 17:44:54 -0700
committerGraydon Hoare <graydon@mozilla.com>2011-06-13 18:14:13 -0700
commitd1857d30fc05f29fb82231336b229e50948a8336 (patch)
tree8a1ad8ad6dcda631e4858902008e3d7b8227b271 /src/rt/rust_builtin.cpp
parent1595c9d767de72340358028e87d3eb386af0adfe (diff)
downloadrust-d1857d30fc05f29fb82231336b229e50948a8336.tar.gz
rust-d1857d30fc05f29fb82231336b229e50948a8336.zip
This is the mega-ucontext commit. It replaces the task switching mechanism with a new one inspired by ucontext. It works under Linux, OS X and Windows, and is Valgrind clean on Linux and OS X (provided the runtime is built with gcc).
This commit also moves yield and join to the standard library, as requested in #42. Join is currently a no-op though.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index f4b2639b137..65c9d7e76a1 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -354,6 +354,16 @@ task_sleep(rust_task *task, size_t time_in_us) {
     upcall_sleep(task, time_in_us);
 }
 
+extern "C" CDECL void
+task_yield(rust_task *task) {
+    task->yield(1);
+}
+
+extern "C" CDECL void
+task_join(rust_task *task, rust_task *join_task) {
+    // TODO
+}
+
 /* Debug builtins for std.dbg. */
 
 static void