Skip to content

std::rt: Fix the set up of the main thread so that it doesn't try to ste... #9857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brson wants to merge 1 commit into from
Closed

std::rt: Fix the set up of the main thread so that it doesn't try to ste... #9857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/libstd/rt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down