chore: replace num_cpus crate with available_parallelism in standard …

…library (#2342)

Cargo.toml

@@ -62,7 +62,6 @@ log = "0.4"
 memchr = "2"
 memmap2 = "0.9.4"
 mime = "0.3"
-num_cpus = "1.16"
 number_prefix = "0.4"
 object = "0.32"
 once_cell = "1.19"

src/bin/sccache-dist/build_freebsd.rs

@@ -115,7 +115,7 @@ impl PotBuilder {
             image_map: Arc::new(Mutex::new(HashMap::new())),
             container_lists: Arc::new(Mutex::new(HashMap::new())),
             cleanup_thread_count: Arc::new(AtomicUsize::new(0)),
-            max_cleanup_thread_count: num_cpus::get() * 3,
+            max_cleanup_thread_count: sccache::util::num_cpus() * 3,
         };
         ret.cleanup()?;
         Ok(ret)

src/dist/http.rs

@@ -243,7 +243,7 @@ pub mod urls {
 
 #[cfg(feature = "dist-server")]
 mod server {
-    use crate::util::new_reqwest_blocking_client;
+    use crate::util::{new_reqwest_blocking_client, num_cpus};
     use byteorder::{BigEndian, ReadBytesExt};
     use flate2::read::ZlibDecoder as ZlibReadDecoder;
     use once_cell::sync::Lazy;
@@ -843,7 +843,7 @@ mod server {
             // This limit is rouille's default for `start_server_with_pool`, which
             // we would use, except that interface doesn't permit any sort of
             // error handling to be done.
-            let server = server.pool_size(num_cpus::get() * 8);
+            let server = server.pool_size(num_cpus() * 8);
             server.run();
 
             panic!("Rouille server terminated")
@@ -925,7 +925,7 @@ mod server {
                 handler,
             } = self;
             let heartbeat_req = HeartbeatServerHttpRequest {
-                num_cpus: num_cpus::get(),
+                num_cpus: num_cpus(),
                 jwt_key: jwt_key.clone(),
                 server_nonce,
                 cert_digest,
@@ -1022,7 +1022,7 @@ mod server {
             // This limit is rouille's default for `start_server_with_pool`, which
             // we would use, except that interface doesn't permit any sort of
             // error handling to be done.
-            let server = server.pool_size(num_cpus::get() * 8);
+            let server = server.pool_size(num_cpus() * 8);
             server.run();
 
             panic!("Rouille server terminated")

src/jobserver.rs

@@ -83,7 +83,7 @@ pub struct Acquired {
 
 impl Client {
     pub fn new() -> Client {
-        Client::new_num(num_cpus::get())
+        Client::new_num(crate::util::num_cpus())
     }
 
     pub fn new_num(num: usize) -> Client {

src/server.rs

@@ -431,7 +431,7 @@ pub fn start_server(config: &Config, addr: &crate::net::SocketAddr) -> Result<()
     let client = Client::new();
     let runtime = tokio::runtime::Builder::new_multi_thread()
         .enable_all()
-        .worker_threads(std::cmp::max(20, 2 * num_cpus::get()))
+        .worker_threads(std::cmp::max(20, 2 * util::num_cpus()))
         .build()?;
     let pool = runtime.handle().clone();
     let dist_client = DistClientContainer::new(config, &pool);

src/util.rs

@@ -1011,6 +1011,10 @@ pub fn ascii_unescape_default(s: &[u8]) -> std::io::Result<Vec<u8>> {
     Ok(out)
 }
 
+pub fn num_cpus() -> usize {
+    std::thread::available_parallelism().map_or(1, std::num::NonZeroUsize::get)
+}
+
 #[cfg(test)]
 mod tests {
     use super::{OsStrExt, TimeMacroFinder};