---

brson · brson · commit 2c2b3a6e7e85 · 2011-11-18T10:32:27.000-08:00
yaml --- r: 6391 b: refs/heads/master c: 5e9f9e8 h: refs/heads/master i: 6389: de1f542 6387: 3d18097 6383: f3d7655 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21865ddce662767ff8319732cb55b4cdbc9ea67e
+refs/heads/master: 5e9f9e8c48374d6b77c4de0b9b691b7b1cc44993
diff --git a/trunk/src/rt/rust_task.cpp b/trunk/src/rt/rust_task.cpp
@@ -169,6 +169,7 @@ struct rust_closure_env {
     type_desc *td;
 };
 
+// This runs on the Rust stack
 extern "C" CDECL
 void task_start_wrapper(spawn_args *a)
 {
@@ -273,6 +274,7 @@ rust_task::yield() {
     yield(0);
 }
 
+// Only run this on the rust stack
 void
 rust_task::yield(size_t time_in_us) {
     LOG(this, task, "task %s @0x%" PRIxPTR " yielding for %d us",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 21865ddce662767ff8319732cb55b4cdbc9ea67e`
	`2`	`+refs/heads/master: 5e9f9e8c48374d6b77c4de0b9b691b7b1cc44993`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ struct rust_closure_env {`
`169`	`169`	`type_desc *td;`
`170`	`170`	`};`
`171`	`171`
	`172`	`+// This runs on the Rust stack`
`172`	`173`	`extern "C" CDECL`
`173`	`174`	`void task_start_wrapper(spawn_args *a)`
`174`	`175`	`{`
`@@ -273,6 +274,7 @@ rust_task::yield() {`
`273`	`274`	`yield(0);`
`274`	`275`	`}`
`275`	`276`
	`277`	`+// Only run this on the rust stack`
`276`	`278`	`void`
`277`	`279`	`rust_task::yield(size_t time_in_us) {`
`278`	`280`	`LOG(this, task, "task %s @0x%" PRIxPTR " yielding for %d us",`