add bindings and fix errors

ClementTsang · ClementTsang · Apr 10, 2023 · Mar 9, 2023 · Mar 11, 2023 · Mar 14, 2023
commit b10d124a575773ed88fd0ebf3e55506658ef6454
diff --git a/src/app/data_harvester/disks/system.rs b/src/app/data_harvester/disks/system.rs
@@ -53,7 +53,7 @@ pub fn get_disk_usage(
     let mut vec_disks: Vec<DiskHarvest> = Vec::new();
 
     for partition in physical_partitions()? {
-        let name = partition.device().to_string();
+        let name = partition.get_device_name();
         let mount_point = partition.mount_point().to_string_lossy().to_string();
 
         // Precedence ordering in the case where name and mount filters disagree, "allow" takes precedence over "deny".

diff --git a/src/app/data_harvester/disks/system/macos/io_counters.rs b/src/app/data_harvester/disks/system/macos/io_counters.rs
@@ -28,7 +28,7 @@ impl IoCounters {
     }
 }
 
-/// Returns an iterator of disk I/O stats. Pulls data from `/proc/diskstats`.
+/// Returns an iterator of disk I/O stats. Pulls data through IOKit.
 pub fn io_stats() -> anyhow::Result<Vec<anyhow::Result<IoCounters>>> {
     Ok(vec![])
 }
diff --git a/src/app/data_harvester/disks/system/macos/io_kit_bindings.rs b/src/app/data_harvester/disks/system/macos/io_kit_bindings.rs
@@ -0,0 +1,36 @@
+//! C FFI bindings for [IOKit](https://developer.apple.com/documentation/iokit/).
+//!
+//! Based on [heim's implementation](https://github.com/heim-rs/heim/blob/master/heim-common/src/sys/macos/iokit/ffi.rs).
+//!
+//! Ideally, we can remove this if sysinfo ever gains disk I/O capabilities... it even already
+//! does all of these bindings!
+
+use mach2::{kern_return::kern_return_t, port::mach_port_t};
+
+pub type io_object_t = mach_port_t;
+
+extern "C" {
+    /// See <https://developer.apple.com/documentation/iokit/kiomasterportdefault> for more info.
+    ///
+    /// Note this is deprecated in favour of [`kIOMainPortDefault`] for macOS 12.0+.
+    pub static kIOMasterPortDefault: mach_port_t;
+
+    /// See <https://developer.apple.com/documentation/iokit/kiomainportdefault> for more info.
+    pub static kIOMainPortDefault: mach_port_t;
+
+    /// Returns the mach port used to initiate communication with IOKit. The port should be
+    /// deallocated with [`IOObjectRelease`]. See <https://developer.apple.com/documentation/iokit/1514652-iomasterport>
+    /// for more info.
+    ///
+    /// Note this is deprecated in favour of [`IOMainPort`] for macOS 12.0+.
+    pub fn IOMasterPort(bootstrapPort: mach_port_t, masterPort: *mut mach_port_t) -> kern_return_t;
+
+    /// Returns the mach port used to initiate communication with IOKit. The port should be
+    /// deallocated with [`IOObjectRelease`]. See <https://developer.apple.com/documentation/iokit/3753260-iomainport>
+    /// for more info.
+    pub fn IOMainPort(bootstrapPort: mach_port_t, masterPort: *mut mach_port_t) -> kern_return_t;
+
+    /// Releases an object handle previously returned by IOKitLib. See <https://developer.apple.com/documentation/iokit/1514627-ioobjectrelease>
+    /// for more info.
+    pub fn IOObjectRelease(object: io_object_t) -> kern_return_t;
+}
diff --git a/src/app/data_harvester/disks/system/macos/mod.rs b/src/app/data_harvester/disks/system/macos/mod.rs
@@ -1,2 +1,4 @@
 mod io_counters;
 pub(crate) use io_counters::*;
+
+mod io_kit_bindings;
diff --git a/src/app/data_harvester/disks/system/other/partition.rs b/src/app/data_harvester/disks/system/other/partition.rs
@@ -48,6 +48,12 @@ impl Partition {
             bail!("statvfs failed to get the disk usage for disk {path:?}")
         }
     }
+
+    /// Returns the device name.
+    #[inline]
+    pub fn get_device_name(&self) -> String {
+        self.device.clone()
+    }
 }
 
 fn partitions_iter() -> anyhow::Result<impl Iterator<Item = Partition>> {