Skip to content

Commit 992b558

Browse files
committed
auto merge of #9004 : brson/rust/issue-8660, r=thestinger
The new scheduler makes better use of threads than the old.
2 parents 6f9ce09 + 738ec51 commit 992b558

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/libextra/test.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,6 @@ fn run_tests(opts: &TestOpts,
731731
}
732732
}
733733

734-
// Windows tends to dislike being overloaded with threads.
735-
#[cfg(windows)]
736-
static SCHED_OVERCOMMIT : uint = 1;
737-
738-
#[cfg(unix)]
739-
static SCHED_OVERCOMMIT : uint = 4u;
740-
741734
fn get_concurrency() -> uint {
742735
use std::rt;
743736
match os::getenv("RUST_TEST_TASKS") {
@@ -749,9 +742,7 @@ fn get_concurrency() -> uint {
749742
}
750743
}
751744
None => {
752-
let threads = rt::util::default_sched_threads();
753-
if threads == 1 { 1 }
754-
else { threads * SCHED_OVERCOMMIT }
745+
rt::util::default_sched_threads()
755746
}
756747
}
757748
}

0 commit comments

Comments
 (0)