From 33d12c1d5774afc575b371083c1e72e8db03edea Mon Sep 17 00:00:00 2001
From: Matt Mastracci <matthew@mastracci.com>
Date: Tue, 6 Feb 2024 16:27:42 -0700
Subject: fix(ext/node): Ensure os.cpus() works on arm64 linux (#22302)

`/proc/cpuinfo` on ARM doesn't have the model name per CPU, so we leave
those as "unknown".
---
 ext/node/ops/os/cpus.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'ext/node/ops/os/cpus.rs')

diff --git a/ext/node/ops/os/cpus.rs b/ext/node/ops/os/cpus.rs
index 6c852dce7..bf83f7e7d 100644
--- a/ext/node/ops/os/cpus.rs
+++ b/ext/node/ops/os/cpus.rs
@@ -245,11 +245,13 @@ pub fn cpu_info() -> Option<Vec<CpuInfo>> {
   let fp = std::fs::File::open("/proc/stat").ok()?;
   let reader = std::io::BufReader::new(fp);
 
+  let mut count = 0;
   for (i, line) in reader.lines().enumerate() {
     let line = line.ok()?;
     if !line.starts_with("cpu") {
       break;
     }
+    count = i;
     let mut fields = line.split_whitespace();
     fields.next()?;
     let user = fields.next()?.parse::<u64>().ok()?;
@@ -268,7 +270,7 @@ pub fn cpu_info() -> Option<Vec<CpuInfo>> {
   let fp = std::fs::File::open("/proc/cpuinfo").ok()?;
   let reader = std::io::BufReader::new(fp);
 
-  let mut i = 0;
+  let mut j = 0;
   for line in reader.lines() {
     let line = line.ok()?;
     if !line.starts_with("model name") {
@@ -278,11 +280,16 @@ pub fn cpu_info() -> Option<Vec<CpuInfo>> {
     fields.next()?;
     let model = fields.next()?.trim();
 
-    cpus[i].model = model.to_string();
-    i += 1;
+    cpus[j].model = model.to_string();
+    j += 1;
   }
 
-  cpus.truncate(i);
+  while j < count {
+    cpus[j].model = "unknown".to_string();
+    j += 1;
+  }
+
+  cpus.truncate(count);
   Some(cpus)
 }
 
-- 
cgit v1.2.3