other: support hw.temperature-based temps for FreeBSD

ClementTsang · Feb 18, 2023 · 209436b · 209436b
1 parent f89b243
commit 209436b
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,7 +109,13 @@ unicode-width = "0.1.10"
 libc = "0.2.124"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-heim = { version = "0.1.0-rc.1", features = ["cpu", "disk", "memory", "net", "sensors"] }
+heim = { version = "0.1.0-rc.1", features = [
+    "cpu",
+    "disk",
+    "memory",
+    "net",
+    "sensors",
+] }
 procfs = { version = "0.14.2", default-features = false }
 smol = "1.2.5"
 
@@ -119,13 +125,16 @@ mach2 = "0.4.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 heim = { version = "0.1.0-rc.1", features = ["cpu", "disk", "memory"] }
-windows = { version = "0.44.0", features = ["Win32_System_Threading", "Win32_Foundation"] }
+windows = { version = "0.44.0", features = [
+    "Win32_System_Threading",
+    "Win32_Foundation",
+] }
 
 winapi = "0.3.9"
 
 [target.'cfg(target_os = "freebsd")'.dependencies]
 serde_json = { version = "1.0.82" }
-sysctl = { version = "0.5.2", optional = true }
+sysctl = { version = "0.5.4", optional = true }
 filedescriptor = "0.8.2"
 
 [dev-dependencies]

diff --git a/src/app/data_harvester/temperature/sysinfo.rs b/src/app/data_harvester/temperature/sysinfo.rs
@@ -38,5 +38,32 @@ pub fn get_temperature_data(
         super::nvidia::add_nvidia_data(&mut temperature_vec, temp_type, filter)?;
     }
 
+    // For RockPro64 boards on FreeBSD, they apparently use "hw.temperature" for sensors.
+    #[cfg(target_os = "freebsd")]
+    {
+        use sysctl::Sysctl;
+
+        const KEY: &str = "hw.temperature";
+        if let Ok(root) = sysctl::Ctl::new(KEY) {
+            for ctl in sysctl::CtlIter::below(root) {
+                if let Ok(ctl) = ctl {
+                    if let (Ok(name), Ok(temp)) = (ctl.name(), ctl.value()) {
+                        if let Some(temp) = temp.as_temperature() {
+                            temperature_vec.push(TempHarvest {
+                                name,
+                                temperature: match temp_type {
+                                    TemperatureType::Celsius => temp.celsius(),
+                                    TemperatureType::Kelvin => temp.kelvin(),
+                                    TemperatureType::Fahrenheit => temp.fahrenheit(),
+                                },
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // TODO: Should we instead use a hashmap -> vec to skip dupes?
     Ok(Some(temperature_vec))
 }