From 818ebf2ed6c6f61d0a2ec86cb104c4467b28d75e Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 14 Oct 2013 16:08:18 -0700 Subject: [PATCH] std::rt: Fix the set up of the main thread so that it doesn't try to steal 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. --- src/libstd/rt/mod.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 78f0bb0a07c..9ea7b734d24 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -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