Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-17 02:08:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

nproc: fix conditional compilation

Browse source
This commit is contained in:
Hiroki Noda 2017-05-29 12:08:47 +09:00
parent 5e95d3752e
commit a30d732463
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nproc/nproc.rs
View file

@ -12,7 +12,7 @@
extern crate getopts;
extern crate num_cpus;
#[cfg(not(windows))]
#[cfg(unix)]
extern crate libc;
#[macro_use]
@ -89,19 +89,7 @@ Print the number of cores available to the current process.", NAME, VERSION);
}
let mut cores = if matches.opt_present("all") {
if cfg!(target_os = "linux") || cfg!(target_os = "macos") || cfg!(target_os = "freebsd") || cfg!(target_os = "netbsd") {
let nprocs = unsafe { libc::sysconf(_SC_NPROCESSORS_CONF) };
if nprocs == 1 {
// In some situation, /proc and /sys are not mounted, and sysconf returns 1.
// However, we want to guarantee that `nproc --all` >= `nproc`.
num_cpus::get()
} else {
if nprocs > 0 { nprocs as usize } else { 1 }
}
} else {
// Other platform(e.g., windows), num_cpus::get() directly.
num_cpus::get()
}
num_cpus_all()
} else {
num_cpus::get()
};
@ -114,3 +102,27 @@ Print the number of cores available to the current process.", NAME, VERSION);
println!("{}", cores);
0
}
#[cfg(any(target_os = "linux",
target_os = "macos",
target_os = "freebsd",
target_os = "netbsd"))]
fn num_cpus_all() -> usize {
let nprocs = unsafe { libc::sysconf(_SC_NPROCESSORS_CONF) };
if nprocs == 1 {
// In some situation, /proc and /sys are not mounted, and sysconf returns 1.
// However, we want to guarantee that `nproc --all` >= `nproc`.
num_cpus::get()
} else {
if nprocs > 0 { nprocs as usize } else { 1 }
}
}
// Other platform(e.g., windows), num_cpus::get() directly.
#[cfg(not(any(target_os = "linux",
target_os = "macos",
target_os = "freebsd",
target_os = "netbsd")))]
fn num_cpus_all() -> usize {
num_cpus::get()
}