robin/palantir
1
0
Fork 0
mirror of https://codeberg.org/icewind/palantir.git synced 2026-06-03 18:24:08 +02:00
Code Issues Projects Releases Wiki Activity

coretemp

Browse source
This commit is contained in:
Robin Appelman 2021-03-29 13:34:12 +02:00
commit a9fd4d64a4
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sensors.rs
View file

@ -49,9 +49,12 @@ pub struct DiskUsage {
pub fn temperatures() -> Result<Temperatures> { pub fn temperatures() -> Result<Temperatures> {
let mut temps = Temperatures::default(); let mut temps = Temperatures::default();
const DESIRED_HW_MON: &[&[u8]] = &[b"k10temp\n"]; const DESIRED_HW_MON: &[&[u8]] = &[b"k10temp\n", b"coretemp\n"];
const DESIRED_SENSORS: &[&[u8]] = &[b"Tdie\n"]; const DESIRED_SENSORS: &[&[u8]] = &[b"Tdie\n"];
let mut cores_found = 0.0;
let mut core_total = 0.0;
for hwmon in read_dir("/sys/class/hwmon")? { for hwmon in read_dir("/sys/class/hwmon")? {
let hwmon = hwmon?; let hwmon = hwmon?;
let hwmon_name = read(hwmon.path().join("name"))?; let hwmon_name = read(hwmon.path().join("name"))?;
@ -68,7 +71,7 @@ pub fn temperatures() -> Result<Temperatures> {
} else { } else {
continue; continue;
}; };
if !DESIRED_SENSORS.contains(&label.as_slice()) { if !DESIRED_SENSORS.contains(&label.as_slice()) && !label.starts_with(b"Core") {
continue; continue;
} }
let mut path = path let mut path = path
@ -80,12 +83,20 @@ pub fn temperatures() -> Result<Temperatures> {
let value = read_to_string(path)?; let value = read_to_string(path)?;
let parsed: u32 = value.trim().parse()?; let parsed: u32 = value.trim().parse()?;
match (hwmon_name.as_slice(), label.as_slice()) { match (hwmon_name.as_slice(), label.as_slice()) {
(b"k10temp\n", b"Tdie\n") => temps.cpu = parsed as f32 / 100.0, (b"k10temp\n", b"Tdie\n") => temps.cpu = parsed as f32 / 1000.0,
(b"coretemp\n", core) if core.starts_with(b"Core") => {
cores_found += 1.0;
core_total += parsed as f32 / 1000.0
}
_ => {} _ => {}
} }
} }
} }
if temps.cpu == 0.0 && core_total > 0.0 {
temps.cpu = core_total / cores_found
}
Ok(temps) Ok(temps)
} }