Skip to content

Commit 29c9443

Browse files
committed
std: Add a yield implementation for newsched
1 parent 7826651 commit 29c9443

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

src/libstd/task/mod.rs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,26 @@ pub fn try<T:Send>(f: ~fn() -> T) -> Result<T,()> {
497497
pub fn yield() {
498498
//! Yield control to the task scheduler
499499
500+
use rt::{context, OldTaskContext};
501+
use rt::local::Local;
502+
use rt::sched::Scheduler;
503+
500504
unsafe {
501-
let task_ = rt::rust_get_task();
502-
let killed = rt::rust_task_yield(task_);
503-
if killed && !failing() {
504-
fail!("killed");
505+
match context() {
506+
OldTaskContext => {
507+
let task_ = rt::rust_get_task();
508+
let killed = rt::rust_task_yield(task_);
509+
if killed && !failing() {
510+
fail!("killed");
511+
}
512+
}
513+
_ => {
514+
// XXX: What does yield really mean in newsched?
515+
let sched = Local::take::<Scheduler>();
516+
do sched.deschedule_running_task_and_then |sched, task| {
517+
sched.enqueue_task(task);
518+
}
519+
}
505520
}
506521
}
507522
}

0 commit comments

Comments
 (0)