Merge remote-tracking branch 'rlupton20/disk-stats'

* rlupton20/disk-stats:
  Use usize over u64
  Add example
  Layout tweak
  Move block stats struct
  Tidying
  Put name inside stats
  Add block_device_statistics to linux
  Parsers for /proc/diskstats
  Move to map data structure
  Stub out disk stats

Author: valpackett

examples/info.rs

@@ -18,6 +18,15 @@ fn main() {
         Err(x) => println!("\nMounts: error: {}", x)
     }
 
+    match sys.block_device_statistics() {
+        Ok(stats) => {
+            for blkstats in stats.values() {
+                println!("{}: {:?}", blkstats.name, blkstats);
+            }
+        }
+        Err(x) => println!("Block statistics error: {}", x.to_string())
+    }
+
     match sys.networks() {
         Ok(netifs) => {
             println!("\nNetworks:");

src/data.rs

@@ -173,6 +173,22 @@ pub struct Filesystem {
     pub fs_mounted_on: String,
 }
 
+#[derive(Debug, Clone)]
+pub struct BlockDeviceStats {
+    pub name: String,
+    pub read_ios: usize,
+    pub read_merges: usize,
+    pub read_sectors: usize,
+    pub read_ticks: usize,
+    pub write_ios: usize,
+    pub write_merges: usize,
+    pub write_sectors: usize,
+    pub write_ticks: usize,
+    pub in_flight: usize,
+    pub io_ticks: usize,
+    pub time_in_queue: usize,
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum IpAddr {
     Empty,

src/platform/common.rs

@@ -60,6 +60,9 @@ pub trait Platform {
     /// Returns a filesystem mount information object for the filesystem at a given path.
     fn mount_at<P: AsRef<path::Path>>(&self, path: P) -> io::Result<Filesystem>;
 
+    /// Returns a map of block device statistics objects
+    fn block_device_statistics(&self) -> io::Result<BTreeMap<String, BlockDeviceStats>>;
+
     /// Returns a map of network intefrace information objects.
     ///
     /// It's a map because most operating systems return an object per IP address, not per

src/platform/freebsd.rs

@@ -141,6 +141,10 @@ impl Platform for PlatformImpl {
         Ok(sfs.to_fs())
     }
 
+    fn block_device_statistics(&self) -> io::Result<BTreeMap<String, BlockDeviceStats>> {
+        Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
+    }
+
     fn networks(&self) -> io::Result<BTreeMap<String, Network>> {
         unix::networks()
     }

src/platform/linux.rs

@@ -200,6 +200,47 @@ fn stat_mount(mount: ProcMountsData) -> io::Result<Filesystem> {
     }
 }
 
+/// Parse a line of `/proc/diskstats`
+named!(
+    proc_diskstats_line<BlockDeviceStats>,
+    ws!(do_parse!(
+        major_number: usize_s >>
+        minor_number: usize_s >>
+        name: word_s >>
+        read_ios: usize_s >>
+        read_merges: usize_s >>
+        read_sectors: usize_s >>
+        read_ticks: usize_s >>
+        write_ios: usize_s >>
+        write_merges: usize_s >>
+        write_sectors: usize_s >>
+        write_ticks: usize_s >>
+        in_flight: usize_s >>
+        io_ticks: usize_s >>
+        time_in_queue: usize_s >>
+        (BlockDeviceStats {
+            name: name,
+            read_ios: read_ios,
+            read_merges: read_merges,
+            read_sectors: read_sectors,
+            read_ticks: read_ticks,
+            write_ios: write_ios,
+            write_merges: write_merges,
+            write_sectors: write_sectors,
+            write_ticks: write_ticks,
+            in_flight: in_flight,
+            io_ticks: io_ticks,
+            time_in_queue: time_in_queue
+        })
+    ))
+);
+
+/// Parse `/proc/diskstats` to get a Vec<BlockDeviceStats>
+named!(proc_diskstats<Vec<BlockDeviceStats>>,
+       many0!(ws!(flat_map!(not_line_ending, proc_diskstats_line)))
+);
+
+
 pub struct PlatformImpl;
 
 /// An implementation of `Platform` for Linux.
@@ -370,6 +411,21 @@ impl Platform for PlatformImpl {
             .and_then(stat_mount)
     }
 
+    fn block_device_statistics(&self) -> io::Result<BTreeMap<String, BlockDeviceStats>> {
+        let mut result: BTreeMap<String, BlockDeviceStats> = BTreeMap::new();
+        let stats: Vec<BlockDeviceStats> = try!(read_file("/proc/diskstats")
+            .and_then(|data| {
+                proc_diskstats(data.as_bytes()).to_result()
+                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))
+            })
+        );
+
+        for blkstats in stats {
+            result.entry(blkstats.name.clone()).or_insert(blkstats);
+        }
+        Ok(result)
+    }
+
     fn networks(&self) -> io::Result<BTreeMap<String, Network>> {
         unix::networks()
     }

src/platform/openbsd.rs

@@ -118,6 +118,10 @@ impl Platform for PlatformImpl {
         Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
     }
 
+    fn block_device_statistics(&self) -> io::Result<BTreeMap<String, BlockDeviceStats>> {
+        Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
+    }
+
     fn networks(&self) -> io::Result<BTreeMap<String, Network>> {
         unix::networks()
     }

src/platform/windows.rs

@@ -85,6 +85,10 @@ impl Platform for PlatformImpl {
         Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
     }
 
+    fn block_device_statistics(&self) -> io::Result<BTreeMap<String, BlockDeviceStats>> {
+        Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
+    }
+
     fn networks(&self) -> io::Result<BTreeMap<String, Network>> {
         Err(io::Error::new(io::ErrorKind::Other, "Not supported"))
     }