---

yaml
---
r: 142601
b: refs/heads/try2
c: 8afec77
h: refs/heads/master
i:
  142599: 087a9dd
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f9a5005f52d528797d6b98a3bee73ab2d71b9aa3
+refs/heads/try2: 8afec77cb07394c5f2d54dcc0ebe075fc304efb7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/test.rs

@@ -59,21 +59,32 @@ pub fn run_in_newsched_task(f: ~fn()) {
 /// in one of the schedulers. The schedulers will stay alive
 /// until the function `f` returns.
 pub fn run_in_mt_newsched_task(f: ~fn()) {
+    use libc;
+    use os;
+    use from_str::FromStr;
     use rt::uv::uvio::UvEventLoop;
     use rt::sched::Shutdown;
 
     let f_cell = Cell(f);
 
     do run_in_bare_thread {
-        static N: uint = 4;
+        let nthreads = match os::getenv("RUST_TEST_THREADS") {
+            Some(nstr) => FromStr::from_str(nstr).get(),
+            None => unsafe {
+                // Using more threads than cores in test code
+                // to force the OS to preempt them frequently.
+                // Assuming that this help stress test concurrent types.
+                rust_get_num_cpus() * 2
+            }
+        };
 
         let sleepers = SleeperList::new();
         let work_queue = WorkQueue::new();
 
         let mut handles = ~[];
         let mut scheds = ~[];
 
-        for uint::range(0, N) |_| {
+        for uint::range(0, nthreads) |_| {
             let loop_ = ~UvEventLoop::new();
             let mut sched = ~Scheduler::new(loop_, work_queue.clone(), sleepers.clone());
             let handle = sched.make_handle();
@@ -111,6 +122,10 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
         // Wait for schedulers
         let _threads = threads;
     }
+
+    extern {
+        fn rust_get_num_cpus() -> libc::uintptr_t;
+    }
 }
 
 /// Test tasks will abort on failure instead of unwinding