Merge pull request nokyan#210 from nokyan/multi-socket-cpu-fix

Fix logical CPUs being wrong for multi socket systems

Cargo.toml

@@ -25,7 +25,7 @@ regex = "1.10.2"
 sysconf = "0.3.4"
 nvml-wrapper = "0.10.0"
 unescape = "0.1.0"
-nix = { version = "0.28", features = ["signal"] }
+nix = { version = "0.28", default_features = false, features = ["signal"] }
 plotters = { version = "0.3.5", default_features = false, features = [
     "area_series",
 ] }

lib/process_data/src/pci_slot.rs

@@ -24,6 +24,7 @@ impl PciSlot {
 }
 
 #[derive(Debug)]
+#[allow(dead_code)]
 pub struct ParseError(String);
 
 impl Error for ParseError {

src/utils/cpu.rs

@@ -166,19 +166,16 @@ pub fn cpu_info() -> Result<CpuInfo> {
         });
 
     let logical_cpus = RE_LSCPU_CPUS.captures(&lscpu_output).and_then(|captures| {
-        captures.get(1).and_then(|capture| {
-            capture
-                .as_str()
-                .parse::<usize>()
-                .ok()
-                .map(|int| int * sockets.unwrap_or(1))
-        })
+        captures
+            .get(1)
+            .and_then(|capture| capture.as_str().parse().ok())
     });
 
     let physical_cpus = RE_LSCPU_CORES.captures(&lscpu_output).and_then(|captures| {
         captures
             .get(1)
-            .and_then(|capture| capture.as_str().parse().ok())
+            .and_then(|capture| capture.as_str().parse::<usize>().ok())
+            .map(|int| int * sockets.unwrap_or(1))
     });
 
     let virtualization = RE_LSCPU_VIRTUALIZATION