refactor: migrate memory collection to sysinfo for all platforms

Cargo.toml

@@ -108,16 +108,15 @@ unicode-width = "0.1.10"
 libc = "0.2.124"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-heim = { version = "0.1.0-rc.1", features = ["disk", "memory", "net", "sensors"] }
+heim = { version = "0.1.0-rc.1", features = ["disk", "net", "sensors"] }
 procfs = { version = "0.15.1", default-features = false }
-smol = "1.2.5"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-heim = { version = "0.1.0-rc.1", features = ["disk", "memory", "net"] }
+heim = { version = "0.1.0-rc.1", features = ["disk", "net"] }
 mach2 = "0.4.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-heim = { version = "0.1.0-rc.1", features = ["disk", "memory"] }
+heim = { version = "0.1.0-rc.1", features = ["disk"] }
 windows = { version = "0.44.0", features = [
     "Win32_System_Threading",
     "Win32_Foundation",

src/app/data_harvester.rs

@@ -12,6 +12,8 @@ use starship_battery::{Battery, Manager};
 
 use sysinfo::{System, SystemExt};
 
+use self::memory::MemCollect;
+
 use super::DataFilters;
 use crate::app::layout_manager::UsedWidgets;
 
@@ -155,15 +157,11 @@ impl DataCollector {
     }
 
     pub fn init(&mut self) {
-        #[cfg(target_os = "linux")]
-        {
-            futures::executor::block_on(self.initialize_memory_size());
-        }
+        self.sys.refresh_memory();
+        self.mem_total_kb = self.sys.total_memory();
+
         #[cfg(not(target_os = "linux"))]
         {
-            self.sys.refresh_memory();
-            self.mem_total_kb = self.sys.total_memory();
-
             // TODO: Would be good to get this and network list running on a timer instead...?
             // Refresh components list once...
             if self.widgets_to_harvest.use_temp {
@@ -211,15 +209,6 @@ impl DataCollector {
         self.data.cleanup();
     }
 
-    #[cfg(target_os = "linux")]
-    async fn initialize_memory_size(&mut self) {
-        self.mem_total_kb = if let Ok(mem) = heim::memory::memory().await {
-            mem.total().get::<heim::units::information::kilobyte>()
-        } else {
-            1
-        };
-    }
-
     pub fn set_data_collection(&mut self, used_widgets: UsedWidgets) {
         self.widgets_to_harvest = used_widgets;
     }
@@ -245,6 +234,10 @@ impl DataCollector {
             self.sys.refresh_cpu();
         }
 
+        if self.widgets_to_harvest.use_mem {
+            self.sys.refresh_memory();
+        }
+
         #[cfg(not(target_os = "linux"))]
         {
             if self.widgets_to_harvest.use_proc {
@@ -266,9 +259,6 @@ impl DataCollector {
                 if self.widgets_to_harvest.use_disk {
                     self.sys.refresh_disks();
                 }
-                if self.widgets_to_harvest.use_mem {
-                    self.sys.refresh_memory();
-                }
             }
         }
 
@@ -378,6 +368,30 @@ impl DataCollector {
             }
         }
 
+        if self.widgets_to_harvest.use_mem {
+            let MemCollect {
+                ram,
+                swap,
+                #[cfg(feature = "gpu")]
+                gpus,
+                #[cfg(feature = "zfs")]
+                arc,
+            } = memory::get_mem_data(&self.sys, self.widgets_to_harvest.use_gpu);
+
+            self.data.memory = ram;
+            self.data.swap = swap;
+
+            #[cfg(feature = "zfs")]
+            {
+                self.data.arc = arc;
+            }
+
+            #[cfg(feature = "gpu")]
+            {
+                self.data.gpu = gpus;
+            }
+        }
+
         let network_data_fut = {
             #[cfg(any(target_os = "windows", target_os = "freebsd"))]
             {
@@ -403,36 +417,16 @@ impl DataCollector {
                 )
             }
         };
-        let mem_data_fut = {
-            #[cfg(not(target_os = "freebsd"))]
-            {
-                memory::get_mem_data(
-                    self.widgets_to_harvest.use_mem,
-                    self.widgets_to_harvest.use_gpu,
-                )
-            }
-            #[cfg(target_os = "freebsd")]
-            {
-                memory::get_mem_data(
-                    &self.sys,
-                    self.widgets_to_harvest.use_mem,
-                    self.widgets_to_harvest.use_gpu,
-                )
-            }
-        };
+
         let disk_data_fut = disks::get_disk_usage(
             self.widgets_to_harvest.use_disk,
             &self.filters.disk_filter,
             &self.filters.mount_filter,
         );
         let disk_io_usage_fut = disks::get_io_usage(self.widgets_to_harvest.use_disk);
 
-        let (net_data, mem_res, disk_res, io_res) = join!(
-            network_data_fut,
-            mem_data_fut,
-            disk_data_fut,
-            disk_io_usage_fut,
-        );
+        let (net_data, disk_res, io_res) =
+            join!(network_data_fut, disk_data_fut, disk_io_usage_fut,);
 
         if let Ok(net_data) = net_data {
             if let Some(net_data) = &net_data {
@@ -442,24 +436,6 @@ impl DataCollector {
             self.data.network = net_data;
         }
 
-        if let Ok(memory) = mem_res.ram {
-            self.data.memory = memory;
-        }
-
-        if let Ok(swap) = mem_res.swap {
-            self.data.swap = swap;
-        }
-
-        #[cfg(feature = "zfs")]
-        if let Ok(arc) = mem_res.arc {
-            self.data.arc = arc;
-        }
-
-        #[cfg(feature = "gpu")]
-        if let Ok(gpu) = mem_res.gpus {
-            self.data.gpu = gpu;
-        }
-
         if let Ok(disks) = disk_res {
             self.data.disks = disks;
         }

src/app/data_harvester/memory.rs

@@ -1,10 +1,21 @@
-//! Data collection for memory.
-//!
-//! For Linux, macOS, and Windows, this is handled by Heim. On FreeBSD it is handled by sysinfo.
+//! Memory data collection.
 
-cfg_if::cfg_if! {
-    if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "macos", target_os = "windows"))] {
-        pub mod general;
-        pub use self::general::*;
-    }
+pub mod sysinfo;
+pub(crate) use self::sysinfo::*;
+
+#[derive(Debug, Clone, Default)]
+pub struct MemHarvest {
+    pub total_kib: u64,
+    pub used_kib: u64,
+    pub use_percent: Option<f64>,
+}
+
+#[derive(Debug)]
+pub struct MemCollect {
+    pub ram: Option<MemHarvest>,
+    pub swap: Option<MemHarvest>,
+    #[cfg(feature = "zfs")]
+    pub arc: Option<MemHarvest>,
+    #[cfg(feature = "gpu")]
+    pub gpus: Option<Vec<(String, MemHarvest)>>,
 }