1
Fork 0

core: Wire up spawn to the new scheduler

It will check which scheduler it is running under and create the
correct type of task as appropriate. Most options aren't supported
but basic spawning works.
This commit is contained in:
Brian Anderson 2013-04-18 18:38:12 -07:00
parent 6773b63671
commit 15ece0c23e
3 changed files with 59 additions and 0 deletions

View file

@ -160,3 +160,24 @@ fn test_context() {
sched.run();
}
}
// For setting up tests of the new scheduler
#[cfg(test)]
pub fn run_in_newsched_task(f: ~fn()) {
use cell::Cell;
use unstable::run_in_bare_thread;
use self::sched::{Scheduler, Task};
use self::uvio::UvEventLoop;
let f = Cell(Cell(f));
do run_in_bare_thread {
let mut sched = ~UvEventLoop::new_scheduler();
let f = f.take();
let task = ~do Task::new(&mut sched.stack_pool) {
(f.take())();
};
sched.task_queue.push_back(task);
sched.run();
}
}

View file

@ -1226,3 +1226,12 @@ fn test_spawn_thread_on_demand() {
port.recv();
}
#[test]
fn test_simple_newsched_spawn() {
use rt::run_in_newsched_task;
do run_in_newsched_task {
spawn(||())
}
}

View file

@ -531,6 +531,35 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
}
pub fn spawn_raw(opts: TaskOpts, f: ~fn()) {
use rt::*;
match context() {
OldTaskContext => {
spawn_raw_oldsched(opts, f)
}
TaskContext => {
spawn_raw_newsched(opts, f)
}
SchedulerContext => {
fail!(~"can't spawn from scheduler context")
}
GlobalContext => {
fail!(~"can't spawn from global context")
}
}
}
fn spawn_raw_newsched(opts: TaskOpts, f: ~fn()) {
use rt::sched::*;
// XXX: How to schedule a new task is a policy decision that shouldn't be made here
let mut sched = Scheduler::take_local();
let task = ~Task::new(&mut sched.stack_pool, f);
sched.resume_task_from_running_task_direct(task);
}
fn spawn_raw_oldsched(opts: TaskOpts, f: ~fn()) {
let (child_tg, ancestors, is_main) =
gen_child_taskgroup(opts.linked, opts.supervised);