Merge pull request #45 from GuildMasterInfinite/master

seanmonstar · web-flow · commit a0a5798ea0f2 · 2017-06-22T08:51:41.000-07:00
Use PROCESSORS_CONF instead of PROCESSORS_ONLN to fix ARM bug
diff --git a/src/lib.rs b/src/lib.rs
@@ -273,7 +273,7 @@ fn get_num_cpus() -> usize {
     target_os = "fuchsia")
 )]
 fn get_num_cpus() -> usize {
-    let cpus = unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) };
+    let cpus = unsafe { libc::sysconf(libc::_SC_NPROCESSORS_CONF) };
     if cpus < 1 {
         1
     } else {

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ fn get_num_cpus() -> usize {`
`273`	`273`	`target_os = "fuchsia")`
`274`	`274`	`)]`
`275`	`275`	`fn get_num_cpus() -> usize {`
`276`		`- let cpus = unsafe { libc::sysconf(libc::_SC_NPROCESSORS_ONLN) };`
	`276`	`+ let cpus = unsafe { libc::sysconf(libc::_SC_NPROCESSORS_CONF) };`
`277`	`277`	`if cpus < 1 {`
`278`	`278`	`1`
`279`	`279`	`} else {`