auto merge of #9004 : brson/rust/issue-8660, r=thestinger

The new scheduler makes better use of threads than the old.
This commit is contained in:
bors 2013-09-05 16:40:48 -07:00
commit 992b558d3c
1 changed files with 1 additions and 10 deletions

View File

@ -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()
}
}
}