---

eholk · eholk · commit 7d341d6782f1 · 2012-06-19T12:26:58.000-07:00
yaml --- r: 13562 b: refs/heads/master c: ec0fbf5 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6e73e45e372a0dfc5a2ebf19780dc392ec092492
+refs/heads/master: ec0fbf526e76716379b86d53c1588e8f02ae986d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rt/rust_builtin.cpp b/trunk/src/rt/rust_builtin.cpp
@@ -896,7 +896,8 @@ rust_wait_cond_lock(rust_cond_lock *lock) {
     lock->waiting = task;
     task->block(lock, "waiting for signal");
     lock->lock.unlock();
-    task->yield(false);
+    bool killed = false;
+    task->yield(&killed);
     lock->lock.lock();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,8 @@ rust_wait_cond_lock(rust_cond_lock *lock) {`
`896`	`896`	`lock->waiting = task;`
`897`	`897`	`task->block(lock, "waiting for signal");`
`898`	`898`	`lock->lock.unlock();`
`899`		`- task->yield(false);`
	`899`	`+ bool killed = false;`
	`900`	`+ task->yield(&killed);`
`900`	`901`	`lock->lock.lock();`
`901`	`902`	`}`
`902`	`903`