diff options
| author | bors <bors@rust-lang.org> | 2013-09-05 16:40:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-05 16:40:48 -0700 |
| commit | 992b558d3c60b20d64a9d65b4c761f10dece95a4 (patch) | |
| tree | 591bfc941649f6a6aea5fa41d166417870695161 | |
| parent | 6f9ce0948a47dbbb5a0ed9aae12e2cce6755465a (diff) | |
| parent | 738ec516f5a48f3e1e648735cf53ec291d841228 (diff) | |
| download | rust-992b558d3c60b20d64a9d65b4c761f10dece95a4.tar.gz rust-992b558d3c60b20d64a9d65b4c761f10dece95a4.zip | |
auto merge of #9004 : brson/rust/issue-8660, r=thestinger
The new scheduler makes better use of threads than the old.
| -rw-r--r-- | src/libextra/test.rs | 11 |
1 files changed, 1 insertions, 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() } } } |
