From 738ec516f5a48f3e1e648735cf53ec291d841228 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 5 Sep 2013 16:36:39 -0700 Subject: [PATCH] extra: Don't overcommit test tasks. Closes #8660 The new scheduler makes better use of threads than the old. --- src/libextra/test.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/libextra/test.rs b/src/libextra/test.rs index 73f6d2e1bda..91db9302f64 100644 --- a/src/libextra/test.rs +++ b/src/libextra/test.rs @@ -731,13 +731,6 @@ fn run_tests(opts: &TestOpts, } } -// Windows tends to dislike being overloaded with threads. -#[cfg(windows)] -static SCHED_OVERCOMMIT : uint = 1; - -#[cfg(unix)] -static SCHED_OVERCOMMIT : uint = 4u; - fn get_concurrency() -> uint { use std::rt; match os::getenv("RUST_TEST_TASKS") { @@ -749,9 +742,7 @@ fn get_concurrency() -> uint { } } None => { - let threads = rt::util::default_sched_threads(); - if threads == 1 { 1 } - else { threads * SCHED_OVERCOMMIT } + rt::util::default_sched_threads() } } }