mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #9857 : brson/rust/mainsched, r=alexcrichton

Browse Source 
...al work

This is causing really awful scheduler behavior where the main thread scheduler is
continually waking up, stealing work, discovering it can't actually run the work,
and sending it off to another scheduler.

No test cases because we don't have suitable instrumentation for it.
This commit is contained in:
bors 2013-10-15 22:56:36 -07:00
commit fabec998e5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/rt/mod.rs
View File

@ -310,8 +310,14 @@ fn run_(main: ~fn(), use_main_sched: bool) -> int {
sleepers.clone(),
false,
Some(friend_handle));
let main_handle = main_sched.make_handle();
handles.push(main_handle);
let mut main_handle = main_sched.make_handle();
// Allow the scheduler to exit when the main task exits.
// Note: sending the shutdown message also prevents the scheduler
// from pushing itself to the sleeper list, which is used for
// waking up schedulers for work stealing; since this is a
// non-work-stealing scheduler it should not be adding itself
// to the list.
main_handle.send_shutdown();
Some(main_sched)
} else {
None