diff options
| author | Dave Huseby <dhuseby@mozilla.com> | 2016-01-26 17:37:18 -0800 |
|---|---|---|
| committer | Dave Huseby <dhuseby@mozilla.com> | 2016-02-02 21:42:11 -0800 |
| commit | 0153e64d975ec175f893ad528311ef7c441a1561 (patch) | |
| tree | 077f0a232b2b2476c5373c8f9b009d6d431e8a10 /src/libtest | |
| parent | 50df6b9dc5144df09ef6b8519afd3657abdab03f (diff) | |
| download | rust-0153e64d975ec175f893ad528311ef7c441a1561.tar.gz rust-0153e64d975ec175f893ad528311ef7c441a1561.zip | |
Fixes #31229
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 130ce3a9637..443356fbe7c 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -939,18 +939,12 @@ fn get_concurrency() -> usize { fn num_cpus() -> usize { let mut cpus: libc::c_uint = 0; let mut cpus_size = std::mem::size_of_val(&cpus); - let mut mib = [libc::CTL_HW, libc::HW_AVAILCPU, 0, 0]; unsafe { - libc::sysctl(mib.as_mut_ptr(), - 2, - &mut cpus as *mut _ as *mut _, - &mut cpus_size as *mut _ as *mut _, - 0 as *mut _, - 0); + cpus = libc::sysconf(libc::_SC_NPROCESSORS_ONLN) as libc::c_uint; } if cpus < 1 { - mib[1] = libc::HW_NCPU; + let mut mib = [libc::CTL_HW, libc::HW_NCPU, 0, 0]; unsafe { libc::sysctl(mib.as_mut_ptr(), 2, |