Merge pull request #279 from jonhoo/rm-num_cpus

Remove dependency on num_cpus
jonhoo · Feb 11, 2023 · d7034f0 · d7034f0
2 parents 2d00691 + 1db493b
commit d7034f0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Removed the dependency on `num_cpus` in favor of `std::thread::available_parallelism`. [#279](https://github.com/jonhoo/inferno/pull/279)
+
 ## [0.11.14] - 2023-01-21
 ### Added
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ exclude = ["/tests/**", "/flamegraph/**", "/*.perf"]
 [features]
 default = ["cli", "multithreaded", "nameattr"]
 cli = ["clap", "env_logger"]
-multithreaded = ["dashmap", "crossbeam-utils", "crossbeam-channel", "num_cpus"]
+multithreaded = ["dashmap", "crossbeam-utils", "crossbeam-channel"]
 nameattr = ["indexmap"]
 
 [dependencies]
@@ -31,7 +31,6 @@ env_logger = { version = "0.9", default-features = false, optional = true }
 indexmap = { version = "1.0", optional = true }
 itoa = "1"
 log = "0.4"
-num_cpus = { version = "1.10", optional = true }
 num-format = { version = "0.4.3", default-features = false }
 quick-xml = { version = "0.26", default-features = false }
 rgb = "0.8.13"

diff --git a/benches/collapse.rs b/benches/collapse.rs
@@ -11,7 +11,7 @@ const INFILE_PERF: &str = "flamegraph/example-perf-stacks.txt.gz";
 const INFILE_SAMPLE: &str = "tests/data/collapse-sample/large.txt.gz";
 const SAMPLE_SIZE: usize = 100;
 
-static NTHREADS: Lazy<usize> = Lazy::new(num_cpus::get);
+static NTHREADS: Lazy<usize> = Lazy::new(|| std::thread::available_parallelism().unwrap().into());
 
 fn read_infile(infile: &str, buf: &mut Vec<u8>) -> io::Result<()> {
     let mut f = File::open(infile)?;

diff --git a/src/collapse/common.rs b/src/collapse/common.rs
@@ -40,7 +40,8 @@ const RUST_HASH_LENGTH: usize = 17;
 
 #[cfg(feature = "multithreaded")]
 #[doc(hidden)]
-pub static DEFAULT_NTHREADS: Lazy<usize> = Lazy::new(num_cpus::get);
+pub static DEFAULT_NTHREADS: Lazy<usize> =
+    Lazy::new(|| std::thread::available_parallelism().unwrap().into());
 #[cfg(not(feature = "multithreaded"))]
 #[doc(hidden)]
 pub static DEFAULT_NTHREADS: Lazy<usize> = Lazy::new(|| 1);