src/app/info_stream.rs

@@ -8,10 +8,7 @@ use iced::{
 use ron::de;
 use smol::{Timer, unblock};
 
-use crate::{
+use crate::{app, sysinfo_snapshot::SysinfoSnapshot};
-    app,
-    sysinfo_snapshot::{self, SysinfoSnapshot},
-};
 
 pub fn create() -> Task<app::Message> {
     if env::args()
@@ -46,7 +43,9 @@ pub fn create() -> Task<app::Message> {
                 1,
                 async |mut sender: futures::channel::mpsc::Sender<SysinfoSnapshot>| {
                     let mut sys = sysinfo::System::new();
-                    let refreshes = sysinfo_snapshot::refreshes();
+                    let refreshes = sysinfo::RefreshKind::nothing()
+                        .with_memory(sysinfo::MemoryRefreshKind::everything())
+                        .with_cpu(sysinfo::CpuRefreshKind::nothing().with_cpu_usage());
 
                     sys.refresh_specifics(refreshes);
                     Timer::after(sysinfo::MINIMUM_CPU_UPDATE_INTERVAL).await;

src/app/mod.rs

@@ -8,7 +8,7 @@ use iced::{
 
 use crate::{
     app::{graph::Graph, utils::maybe_widget},
-    sysinfo_snapshot::{ProcessSnapshot, SysinfoSnapshot},
+    sysinfo_snapshot::SysinfoSnapshot,
     utils::Toggle,
 };
 
@@ -22,7 +22,6 @@ enum Message {
     ToggleMain,
     ToggleCpu,
     ToggleMemory,
-    ToggleProcesses,
 
     Info(SysinfoSnapshot),
 }
@@ -40,9 +39,6 @@ struct State {
     is_memory_section_shown: bool,
     memory_graph: Graph,
     swap_graph: Graph,
-
-    is_processes_section_shown: bool,
-    processes: Vec<ProcessSnapshot>,
 }
 
 impl State {
@@ -69,10 +65,6 @@ impl State {
                 self.is_memory_section_shown.toggle();
                 self.check_borders();
             }
-            Message::ToggleProcesses => {
-                self.is_processes_section_shown.toggle();
-                self.check_borders();
-            }
 
             Message::Info(snapshot) => {
                 self.uptime = snapshot.uptime();
@@ -97,10 +89,6 @@ impl State {
                         .zip(snapshot.cpus.into_iter())
                         .for_each(|(graph, value)| graph.update(value));
                 }
-
-                self.processes = snapshot.processes;
-                self.processes
-                    .sort_by(|a, b| b.cpu_usage.total_cmp(&a.cpu_usage));
             }
         }
 
@@ -127,39 +115,19 @@ impl State {
                 }),
             ])
             .into(),
-            widget::row([
+            maybe_widget(self.is_memory_section_shown, || {
-                maybe_widget(self.is_memory_section_shown, || {
+                widget::row([
-                    widget::row([
+                    widget::canvas(&self.memory_graph)
-                        widget::canvas(&self.memory_graph)
+                        .width(Length::Fill)
-                            .width(Length::Fill)
+                        .height(Length::Fill)
-                            .height(Length::Fill)
+                        .into(),
-                            .into(),
+                    widget::canvas(&self.swap_graph)
-                        widget::canvas(&self.swap_graph)
+                        .width(Length::Fill)
-                            .width(Length::Fill)
+                        .height(Length::Fill)
-                            .height(Length::Fill)
+                        .into(),
-                            .into(),
+                ])
-                    ])
+                .into()
-                    .into()
+            }),
-                }),
-                maybe_widget(self.is_processes_section_shown, || {
-                    widget::scrollable(
-                        widget::grid(self.processes.iter().flat_map(|process| {
-                            [
-                                widget::text(&process.name).into(),
-                                widget::text(process.cpu_usage).into(),
-                                widget::text(format!("{:?}", process.cpu_time())).into(),
-                                widget::text(process.pid).into(),
-                            ]
-                        }))
-                        .height(Length::Shrink)
-                        .columns(4),
-                    )
-                    .width(Length::Fill)
-                    .height(Length::Fill)
-                    .into()
-                }),
-            ])
-            .into(),
         ])
         .into()
     }
@@ -171,7 +139,6 @@ impl State {
                     Key::Character("M" | "1") => Some(Message::ToggleMain),
                     Key::Character("c" | "2") => Some(Message::ToggleCpu),
                     Key::Character("m" | "3") => Some(Message::ToggleMemory),
-                    Key::Character("p" | "4") => Some(Message::ToggleProcesses),
                     _ => None,
                 }
             }

src/server/mod.rs

@@ -2,11 +2,13 @@ use std::{io::Write, thread};
 
 use ron::{Error, ser};
 
-use crate::sysinfo_snapshot::{self, SysinfoSnapshot};
+use crate::sysinfo_snapshot::SysinfoSnapshot;
 
 pub fn run() -> Result<(), Error> {
     let mut sys = sysinfo::System::new();
-    let refreshes = sysinfo_snapshot::refreshes();
+    let refreshes = sysinfo::RefreshKind::nothing()
+        .with_memory(sysinfo::MemoryRefreshKind::everything())
+        .with_cpu(sysinfo::CpuRefreshKind::nothing().with_cpu_usage());
 
     sys.refresh_specifics(refreshes);
     thread::sleep(sysinfo::MINIMUM_CPU_UPDATE_INTERVAL);

src/sysinfo_snapshot.rs

@@ -1,20 +1,7 @@
 use std::time::Duration;
 
-pub fn refreshes() -> sysinfo::RefreshKind {
-    sysinfo::RefreshKind::nothing()
-        .with_memory(sysinfo::MemoryRefreshKind::everything())
-        .with_cpu(sysinfo::CpuRefreshKind::nothing().with_cpu_usage())
-        .with_processes(
-            sysinfo::ProcessRefreshKind::nothing()
-                .with_cpu()
-                .with_cmd(sysinfo::UpdateKind::OnlyIfNotSet)
-                .with_exe(sysinfo::UpdateKind::OnlyIfNotSet),
-        )
-}
-
 #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub struct SysinfoSnapshot {
-    /// in seconds
     uptime: u64,
 
     pub cpu_total: f32,
@@ -24,8 +11,6 @@ pub struct SysinfoSnapshot {
     pub memory_total: u64,
     pub swap: u64,
     pub swap_total: u64,
-
-    pub processes: Vec<ProcessSnapshot>,
 }
 impl SysinfoSnapshot {
     #[cfg_attr(not(feature = "app"), allow(dead_code))]
@@ -46,42 +31,6 @@ impl From<&sysinfo::System> for SysinfoSnapshot {
             memory_total: value.total_memory(),
             swap: value.used_swap(),
             swap_total: value.total_swap(),
-
-            processes: value
-                .processes()
-                .iter()
-                .map(|(_pid, process)| ProcessSnapshot::from(process))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
-pub struct ProcessSnapshot {
-    pub pid: usize,
-
-    /// in CPU-milliseconds
-    accumulated_cpu_time: u64,
-
-    /// note: it's by core, and can be up to eg 1600 on a 16-core device
-    pub cpu_usage: f32,
-
-    pub name: String,
-}
-impl ProcessSnapshot {
-    pub fn cpu_time(&self) -> Duration {
-        Duration::from_millis(self.accumulated_cpu_time)
-    }
-}
-
-impl From<&sysinfo::Process> for ProcessSnapshot {
-    fn from(value: &sysinfo::Process) -> Self {
-        Self {
-            pid: value.pid().into(),
-            accumulated_cpu_time: value.accumulated_cpu_time(),
-            cpu_usage: value.cpu_usage(),
-
-            name: value.name().to_string_lossy().into_owned(),
         }
     }
 }