fix nan; readme linux dependencies

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "toprs"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 description = "Cross platform memory focused top"
 repository =  "https://github.com/griccardos/toprs/"
@@ -15,7 +15,7 @@ dioxus = "0.3.1" #gui
 dioxus-desktop = "0.3.0" #gui
 formato = "0.2.0" #format numbers
 gumdrop = "0.8.1" #arguments
-sysinfo = "0.27.7" #get system info
+sysinfo = "0.28.0" #get system info
 tokio = { version = "1.25.0", features = ["time"] } #sleep
 tui = "0.19.0" #console tui
 dirs ="4.0.0" #for load config from home

README.md

@@ -49,6 +49,19 @@ Flamegraph blue portion is child memory, and red/yellow is its own memory
     - In Linux this is the "resident" memory i.e. used physical memory
 
 
+### Dependencies
+- Linux:
+    - `apt install libwebkit2gtk-4.0-37` (as per tauri)
+    - `apt install libwebkit2gtk-4.0-dev`
+    - `apt install libgtk-3-0` (as per tauri)
+    - `apt install libgtk-3-dev`
+    - `apt install libjavascriptcoregtk-4.0-dev`
+    - `apt install libpango1.0-dev`
+    - `apt install libatk1.0-dev`
+    - `apt install libsoup-gnome2.4-dev`
+
+
+
 ### Thanks
 Shoutout to the following projects that made this possible:
 - rust Sysinfo lib

src/gui.rs

@@ -48,7 +48,7 @@ fn app(cx: Scope) -> Element {
     let totals = man.read().get_totals();
     let mem = nice_size_g_thousands(totals.memory);
     let totmem = nice_size_g_thousands(totals.memory_total);
-    let cpu = format!("{:.1}%", totals.cpu);
+    let cpu = format!("{:5>.1}%", totals.cpu_avg);
     let uptime = nice_time(totals.uptime);
     let eval = use_eval(cx);
     let live = use_state(cx, || true);

src/manager.rs

@@ -33,23 +33,63 @@ impl ProcManager {
         //we use sum of proc resident memory to be consistent with proc display
         let memory = self.procs.iter().map(|x| x.memory).sum();
         //sometimes on macos cpu is nan
-        let mut cpu = self.system.global_cpu_info().cpu_usage();
-        if cpu.is_nan() {
-            cpu = 0.;
-        }
+        let cpus: Vec<f32> = self
+            .system
+            .cpus()
+            .iter()
+            .map(|cpu| cpu.cpu_usage())
+            .collect();
+        let cpu_count = cpus.len();
+        let cpu_total: f32 = cpus.iter().sum::<f32>().zero_if_nan();
+        let cpu_max: f32 = cpus
+            .iter()
+            .max_by(|a, b| a.total_cmp(&b))
+            .copied()
+            .unwrap_or(0.)
+            .zero_if_nan();
+        let cpu_avg = cpu_total / cpu_count as f32;
+
+        /*let proc_sum: f32 = self
+            .system
+            .processes()
+            .iter()
+            .map(|x| x.1.cpu_usage())
+            .sum();
+        println!("cpu: {cpu_total} proc:{proc_sum}");
+        */
+
         Totals {
             memory,
-            cpu,
+            cpu_avg,
+            cpu_total,
+            cpu_count,
+            cpu_max,
             uptime: self.system.uptime(),
             memory_total: self.system.total_memory(),
         }
     }
 }
 
+trait NoNan {
+    fn zero_if_nan(self) -> Self;
+}
+impl NoNan for f32 {
+    fn zero_if_nan(self) -> Self {
+        if self.is_nan() {
+            0.
+        } else {
+            self
+        }
+    }
+}
+
 pub struct Totals {
     pub memory: u64,
     pub memory_total: u64,
-    pub cpu: f32,
+    pub cpu_avg: f32,
+    pub cpu_count: usize,
+    pub cpu_max: f32,
+    pub cpu_total: f32,
     pub uptime: u64,
 }
 

src/tui.rs

@@ -156,8 +156,8 @@ fn draw_top(f: &mut Frame<CrosstermBackend<Stdout>>, state: &State) {
     f.render_widget(mem, Rect::new(0, 0, f.size().width, 1));
 
     let gr = LineGauge::default()
-        .label(format!("Cpu: {:.2}%", totals.cpu))
-        .ratio(totals.cpu as f64 / 100.)
+        .label(format!("Cpu: {:.1}%", totals.cpu_avg))
+        .ratio(totals.cpu_avg as f64 / 100.)
         .line_set(tui::symbols::line::THICK)
         .gauge_style(Style::default().fg(Color::White).bg(Color::LightBlue));