`d583678`

Add temperature collection to daemon

Authored by

espadonne 3 months ago

SHA: d583678e970e9830c7c0f00b7cf740842fa7e324
Parents: 9c4da63
Tree: 541ec6c

2 changed files

Status	File	+	-
M	`gartop/src/daemon/mod.rs`	4	0
M	`gartop/src/daemon/state.rs`	13	2

gartop/src/daemon/mod.rsmodified

                      };
                      Response::ok_with_data(data)
+                 }
 +                Command::GetTemperature => match s.collect_temperature() {
 +                    Ok(stats) => Response::ok_with_data(stats),
 +                    Err(e) => Response::err(e.to_string()),
 +                }
                  Command::GetProcesses { sort_by, limit } => {
                      match s.collect_processes(sort_by.unwrap_or_default(), limit) {
                          Ok(procs) => Response::ok_with_data(procs),

gartop/src/daemon/state.rsmodified

  //! Daemon state management
 -use crate::collector::{CpuCollector, DiskCollector, History, MemoryCollector, NetworkCollector, ProcessCollector};
 +use crate::collector::{CpuCollector, DiskCollector, History, MemoryCollector, NetworkCollector, ProcessCollector, TempCollector};
  use crate::error::Result;
 -use gartop_ipc::{CpuStats, DiskStats, MemoryStats, NetworkStats, ProcessInfo, SortField};
 +use gartop_ipc::{CpuStats, DiskStats, MemoryStats, NetworkStats, ProcessInfo, SortField, TempStats};
  use procfs::Current;
  use std::time::Instant;
      pub network_collector: NetworkCollector,
      pub disk_collector: DiskCollector,
      pub process_collector: ProcessCollector,
 +    pub temp_collector: TempCollector,
      pub cpu_history: History<CpuStats>,
      pub memory_history: History<MemoryStats>,
      pub network_history: History<Vec<NetworkStats>>,
      pub disk_history: History<Vec<DiskStats>>,
      pub processes: Vec<ProcessInfo>,
 +    pub temp_stats: Option<TempStats>,
      pub started: Instant,
      pub sample_interval_ms: u64,
+ }
              network_collector: NetworkCollector::new(),
              disk_collector: DiskCollector::new(),
              process_collector: ProcessCollector::new()?,
 +            temp_collector: TempCollector::new()?,
              cpu_history: History::new(history_size),
              memory_history: History::new(history_size),
              network_history: History::new(history_size),
              disk_history: History::new(history_size),
              processes: Vec::new(),
 +            temp_stats: None,
              started: Instant::now(),
              sample_interval_ms,
          })
          Ok(stats)
+     }
 +    /// Collect temperature stats (no history, just current values).
 +    pub fn collect_temperature(&mut self) -> Result<TempStats> {
 +        let stats = self.temp_collector.collect()?;
 +        self.temp_stats = Some(stats.clone());
 +        Ok(stats)
 +    }
++
      /// Collect process list.
      pub fn collect_processes(
          &mut self,