0.26 fix cpu

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.26.9
+
+ * Linux: Improve compatibility with upcoming `libc` changes for musl targets.
+
 # 0.26.8
 
  * Add `ProcessExt::session_id` method.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sysinfo"
-version = "0.26.8"
+version = "0.26.9"
 authors = ["Guillaume Gomez <[email protected]>"]
 
 description = "Library to get system information such as processes, CPUs, disks, components and networks"

src/linux/cpu.rs

@@ -130,19 +130,39 @@ impl CpusWrapper {
                             brand.clone(),
                         ));
                     } else {
-                        parts.next(); // we don't want the name again
-                        self.cpus[i].set(
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                            parts.next().map(to_u64).unwrap_or(0),
-                        );
+                        // Prevents "index out of bounds" error caused by non-stop cpu expansion.
+                        if i < self.cpus.len() {
+                            parts.next(); // we don't want the name again
+                            self.cpus[i].set(
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                            );
+                        } else {
+                            self.cpus.push(Cpu::new_with_values(
+                                to_str!(parts.next().unwrap_or(&[])),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                parts.next().map(to_u64).unwrap_or(0),
+                                0,
+                                vendor_id.clone(),
+                                brand.clone(),
+                            ));
+                        }
                     }
 
                     i += 1;

src/linux/system.rs

@@ -81,11 +81,8 @@ fn boot_time() -> u64 {
         }
     }
     // Either we didn't find "btime" or "/proc/stat" wasn't available for some reason...
-    let mut up = libc::timespec {
-        tv_sec: 0,
-        tv_nsec: 0,
-    };
     unsafe {
+        let mut up: libc::timespec = std::mem::zeroed();
         if libc::clock_gettime(libc::CLOCK_BOOTTIME, &mut up) == 0 {
             up.tv_sec as u64
         } else {