OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #11158 : alexcrichton/rust/green-bootstrap-task, r=pcwalton 

Closes #11054
This commit is contained in:
bors 2013-12-27 10:11:48 -08:00
parent 00d87e0d81 3c4eb2b1d1
commit cc1b93e425
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libgreen/lib.rs
View File

@ -214,11 +214,7 @@ impl SchedPool {
pool.handles.push(sched.make_handle());
let sched = sched;
pool.threads.push(do Thread::start {
let mut sched = sched;
let task = do GreenTask::new(&mut sched.stack_pool, None) {
rtdebug!("boostraping a non-primary scheduler");
};
sched.bootstrap(task);
sched.bootstrap();
});
}
@ -270,13 +266,7 @@ impl SchedPool {
let ret = sched.make_handle();
self.handles.push(sched.make_handle());
let sched = sched;
self.threads.push(do Thread::start {
let mut sched = sched;
let task = do GreenTask::new(&mut sched.stack_pool, None) {
rtdebug!("boostraping a non-primary scheduler");
};
sched.bootstrap(task);
});
self.threads.push(do Thread::start { sched.bootstrap() });
return ret;
}

36
src/libgreen/sched.rs
View File

@ -171,7 +171,7 @@ impl Scheduler {
// Take a main task to run, and a scheduler to run it in. Create a
// scheduler task and bootstrap into it.
pub fn bootstrap(mut ~self, task: ~GreenTask) {
pub fn bootstrap(mut ~self) {
// Build an Idle callback.
let cb = ~SchedRunner as ~Callback;
@ -187,18 +187,11 @@ impl Scheduler {
self.idle_callback.get_mut_ref().resume();
// Now, as far as all the scheduler state is concerned, we are inside
// the "scheduler" context. So we can act like the scheduler and resume
// the provided task. Let it think that the currently running task is
// actually the sched_task so it knows where to squirrel it away.
let mut sched_task = self.resume_task_immediately(sched_task, task);
// Now we are back in the scheduler context, having
// successfully run the input task. Start by running the
// scheduler. Grab it out of TLS - performing the scheduler
// action will have given it away.
let sched = sched_task.sched.take_unwrap();
rtdebug!("starting scheduler {}", sched.sched_id());
let mut sched_task = sched.run(sched_task);
// the "scheduler" context. The scheduler immediately hands over control
// to the event loop, and this will only exit once the event loop no
// longer has any references (handles or I/O objects).
rtdebug!("starting scheduler {}", self.sched_id());
let mut sched_task = self.run(sched_task);
// Close the idle callback.
let mut sched = sched_task.sched.take_unwrap();
@ -548,7 +541,10 @@ impl Scheduler {
// We push the task onto our local queue clone.
assert!(!task.is_sched());
self.work_queue.push(task);
self.idle_callback.get_mut_ref().resume();
match self.idle_callback {
Some(ref mut idle) => idle.resume(),
None => {} // allow enqueuing before the scheduler starts
}
// We've made work available. Notify a
// sleeping scheduler.
@ -1176,7 +1172,7 @@ mod test {
let mut sh = special_handle;
sh.send(Shutdown);
};
normal_sched.enqueue_task(normal_task);
let special_task = do GreenTask::new(&mut special_sched.stack_pool,
None) {
@ -1184,17 +1180,13 @@ mod test {
run(task3);
chan.send(());
};
special_sched.enqueue_task(special_task);
let normal_sched = normal_sched;
let normal_thread = do Thread::start {
normal_sched.bootstrap(normal_task);
};
let normal_thread = do Thread::start { normal_sched.bootstrap() };
let special_sched = special_sched;
let special_thread = do Thread::start {
special_sched.bootstrap(special_task);
};
let special_thread = do Thread::start { special_sched.bootstrap() };
normal_thread.join();
special_thread.join();