Update README

Signed-off-by: Levente Kurusa <lkurusa@acm.org>

.cargo/config

@@ -0,0 +1,2 @@
+[target.x86_64-unknown-linux-gnu]
+runner = 'sudo -E'

Cargo.toml

@@ -5,10 +5,11 @@ repository = "https://github.com/levex/cgroups-rs"
 keywords = ["linux", "cgroup", "containers", "isolation"]
 categories = ["os", "api-bindings", "os::unix-apis"]
 license = "MIT OR Apache-2.0"
-version = "0.0.2"
+version = "0.1.0"
-authors = ["Levente Kurusa <lkurusa@acm.org>"]
+authors = ["Levente Kurusa <lkurusa@acm.org>", "Sam Wilson <tecywiz121@hotmail.com>"]
 
 [dependencies]
+log = "0.4"
 
 [dev-dependencies]
 nix = "0.11.0"

README.md

@@ -1,25 +1,43 @@
 # cgroups-rs ![Build](https://travis-ci.org/levex/cgroups-rs.svg?branch=master)
 Native Rust library for managing control groups under Linux
 
-# Example
+Right now the crate only support the original, V1 hierarchy, however support
+is planned for the Unified hierarchy.
 
-## Create a control group, and limit the pid resource
+# Examples
+
+## Create a control group using the builder pattern
 
 ``` rust
 // Acquire a handle for the V1 cgroup hierarchy.
 let hier = ::hierarchies::V1::new();
-// Create a control group named "example" in the hierarchy.
+
-let cg = Cgroup::new(&hier, String::from("example"), 0);
+// Use the builder pattern (see the documentation to create the control group)
-{
+//
-    // Get a handle to the pids controller of the control group.
+// This creates a control group named "example" in the V1 hierarchy.
-    let pids: &PidController = cg.controller_of().expect("No pids controller in V1 hierarchy!");
+let cg: Cgroup = CgroupBuilder::new("example", &v1)
-    // Set the maximum amount of processes in the cgroup.
+	.cpu()
-    pids.set_pid_max(PidMax::Value(10));
+		.shares(85)
-    // Check that this has had the desired effect by reading the value back from the kernel.
+		.done()
-    assert_eq!(pids.get_pid_max(), Some(PidMax::Value(10)));
+	.build();
-}
+
-// Once done, delete the control group (and its associated controllers).
+// Now `cg` is a control group that gets 85% of the CPU time in relative to
+// other control groups.
+
+// Get a handle to the CPU controller.
+let cpus: &CpuController = cg.controller_of().unwrap();
+cpus.add_task(1234u64);
+
+// [...]
+
+// Finally, clean up and delete the control group.
 cg.delete();
+
+// Note that `Cgroup` does not implement `Drop` and therefore when the
+// structure is dropped, the Cgroup will stay around. This is because, later
+// you can then re-create the `Cgroup` using `load()`. We aren't too set on
+// this behavior, so it might change in the feature. Rest assured, it will be a
+// major version change.
 ```
 
 # Disclaimer
@@ -27,7 +45,7 @@ cg.delete();
 This crate is licensed under:
 
 - MIT License (see LICENSE-MIT); or
-- Apache 2.0 LIcense (see LICENSE-Apache-2.0),
+- Apache 2.0 License (see LICENSE-Apache-2.0),
 
 at your option.
 

src/blkio.rs

@@ -1,13 +1,17 @@
 //! This module contains the implementation of the `blkio` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/blkio-controller.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt)
-use std::path::PathBuf;
-use std::io::{Read, Write};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, BlkIoResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    BlkIoResources, ControllIdentifier, ControllerInternal, Controllers, Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `blkio` subsystem of a Cgroup.
 ///
@@ -19,90 +23,254 @@ pub struct BlkIoController {
     path: PathBuf,
 }
 
+#[derive(Eq, PartialEq, Debug)]
+/// Per-device information
+pub struct BlkIoData {
+    /// The major number of the device.
+    pub major: i16,
+    /// The minor number of the device.
+    pub minor: i16,
+    /// The data that is associated with the device.
+    pub data: u64,
+}
+
+#[derive(Eq, PartialEq, Debug)]
+/// Per-device activity from the control group.
+pub struct IoService {
+    /// The major number of the device.
+    pub major: i16,
+    /// The minor number of the device.
+    pub minor: i16,
+    /// How many items were read from the device.
+    pub read: u64,
+    /// How many items were written to the device.
+    pub write: u64,
+    /// How many items were synchronously transferred.
+    pub sync: u64,
+    /// How many items were asynchronously transferred.
+    pub async: u64,
+    /// Total number of items transferred.
+    pub total: u64,
+}
+
+fn parse_io_service(s: String) -> Result<Vec<IoService>> {
+    s.lines()
+        .filter(|x| x.split_whitespace().collect::<Vec<_>>().len() == 3)
+        .map(|x| {
+            let mut spl = x.split_whitespace();
+            (spl.nth(0).unwrap(), spl.nth(0).unwrap(), spl.nth(0).unwrap())
+        })
+        .map(|(a, b, c)| {
+            let mut spl = a.split(":");
+            (spl.nth(0).unwrap(), spl.nth(0).unwrap(), b, c)
+        })
+        .collect::<Vec<_>>()
+        .chunks(5)
+        .map(|x| {
+            match x {
+                [(major, minor, "Read", read_val), (_, _, "Write", write_val),
+                   (_, _, "Sync", sync_val), (_, _, "Async", async_val),
+                   (_, _, "Total", total_val)] =>
+                    Some(IoService {
+                        major: major.parse::<i16>().unwrap(),
+                        minor: minor.parse::<i16>().unwrap(),
+                        read: read_val.parse::<u64>().unwrap(),
+                        write: write_val.parse::<u64>().unwrap(),
+                        sync: sync_val.parse::<u64>().unwrap(),
+                        async: async_val.parse::<u64>().unwrap(),
+                        total: total_val.parse::<u64>().unwrap(),
+                    }),
+               _ => None,
+            }
+        })
+        .fold(Ok(Vec::new()), |acc, x| {
+            if acc.is_err() || x.is_none() {
+                Err(Error::new(ParseError))
+            } else {
+                let mut acc = acc.unwrap();
+                acc.push(x.unwrap());
+                Ok(acc)
+            }
+        })
+}
+
+fn parse_io_service_total(s: String) -> Result<u64> {
+    s.lines()
+        .filter(|x| x.split_whitespace().collect::<Vec<_>>().len() == 2)
+        .fold(Err(Error::new(ParseError)), |_, x| {
+            match x.split_whitespace().collect::<Vec<_>>().as_slice() {
+                ["Total", val] => val.parse::<u64>().map_err(|_| Error::new(ParseError)),
+                _ => Err(Error::new(ParseError)),
+            }
+        })
+}
+
+fn parse_blkio_data(s: String) -> Result<Vec<BlkIoData>> {
+    let r = s
+        .chars()
+        .map(|x| if x == ':' { ' ' } else { x })
+        .collect::<String>();
+
+    let r = r
+        .lines()
+        .flat_map(|x| x.split_whitespace())
+        .collect::<Vec<_>>();
+
+    let r = r.chunks(3).collect::<Vec<_>>();
+
+    let mut res = Vec::new();
+
+    let err = r.iter().try_for_each(|x| match x {
+        [major, minor, data] => {
+            res.push(BlkIoData {
+                major: major.parse::<i16>().unwrap(),
+                minor: minor.parse::<i16>().unwrap(),
+                data: data.parse::<u64>().unwrap(),
+            });
+            Ok(())
+        }
+        _ => Err(Error::new(ParseError)),
+    });
+
+    if err.is_err() {
+        return Err(Error::new(ParseError));
+    } else {
+        return Ok(res);
+    }
+}
+
 /// Current state and statistics about how throttled are the block devices when accessed from the
 /// controller's control group.
 #[derive(Debug)]
 pub struct BlkIoThrottle {
+    /// Statistics about the bytes transferred between the block devices by the tasks in this
+    /// control group.
+    pub io_service_bytes: Vec<IoService>,
     /// Total amount of bytes transferred to and from the block devices.
-    pub io_service_bytes: String,
+    pub io_service_bytes_total: u64,
     /// Same as `io_service_bytes`, but contains all descendant control groups.
-    pub io_service_bytes_recursive: String,
+    pub io_service_bytes_recursive: Vec<IoService>,
+    /// Total amount of bytes transferred to and from the block devices, including all descendant
+    /// control groups.
+    pub io_service_bytes_recursive_total: u64,
     /// The number of I/O operations performed on the devices as seen by the throttling policy.
-    pub io_serviced: String,
+    pub io_serviced: Vec<IoService>,
+    /// The total number of I/O operations performed on the devices as seen by the throttling
+    /// policy.
+    pub io_serviced_total: u64,
     /// Same as `io_serviced`, but contains all descendant control groups.
-    pub io_serviced_recursive: String,
+    pub io_serviced_recursive: Vec<IoService>,
+    /// Same as `io_serviced`, but contains all descendant control groups and contains only the
+    /// total amount.
+    pub io_serviced_recursive_total: u64,
     /// The upper limit of bytes per second rate of read operation on the block devices by the
     /// control group's tasks.
-    pub read_bps_device: String,
+    pub read_bps_device: Vec<BlkIoData>,
     /// The upper limit of I/O operation per second, when said operation is a read operation.
-    pub read_iops_device: String,
+    pub read_iops_device: Vec<BlkIoData>,
     /// The upper limit of bytes per second rate of write operation on the block devices by the
     /// control group's tasks.
-    pub write_bps_device: String,
+    pub write_bps_device: Vec<BlkIoData>,
     /// The upper limit of I/O operation per second, when said operation is a write operation.
-    pub write_iops_device: String,
+    pub write_iops_device: Vec<BlkIoData>,
 }
 
 /// Statistics and state of the block devices.
 #[derive(Debug)]
 pub struct BlkIo {
     /// The number of BIOS requests merged into I/O requests by the control group's tasks.
-    pub io_merged: String,
+    pub io_merged: Vec<IoService>,
+    /// Same as `io_merged`, but only reports the total number.
+    pub io_merged_total: u64,
     /// Same as `io_merged`, but contains all descendant control groups.
-    pub io_merged_recursive: String,
+    pub io_merged_recursive: Vec<IoService>,
+    /// Same as `io_merged_recursive`, but only reports the total number.
+    pub io_merged_recursive_total: u64,
     /// The number of requests queued for I/O operations by the tasks of the control group.
-    pub io_queued: String,
+    pub io_queued: Vec<IoService>,
+    /// Same as `io_queued`, but only reports the total number.
+    pub io_queued_total: u64,
     /// Same as `io_queued`, but contains all descendant control groups.
-    pub io_queued_recursive: String,
+    pub io_queued_recursive: Vec<IoService>,
-    /// The number of bytes transferred from and to the block device (as seen by the CFQ I/O
+    /// Same as `io_queued_recursive`, but contains all descendant control groups.
-    /// scheduler).
+    pub io_queued_recursive_total: u64,
-    pub io_service_bytes: String,
+    /// The number of bytes transferred from and to the block device (as seen by the CFQ I/O scheduler).
+    pub io_service_bytes: Vec<IoService>,
     /// Same as `io_service_bytes`, but contains all descendant control groups.
-    pub io_service_bytes_recursive: String,
+    pub io_service_bytes_total: u64,
+    /// Same as `io_service_bytes`, but contains all descendant control groups.
+    pub io_service_bytes_recursive: Vec<IoService>,
+    /// Total amount of bytes transferred between the tasks and block devices, including the
+    /// descendant control groups' numbers.
+    pub io_service_bytes_recursive_total: u64,
     /// The number of I/O operations (as seen by the CFQ I/O scheduler) between the devices and the
     /// control group's tasks.
-    pub io_serviced: String,
+    pub io_serviced: Vec<IoService>,
+    /// The total number of I/O operations performed on the devices as seen by the throttling
+    /// policy.
+    pub io_serviced_total: u64,
     /// Same as `io_serviced`, but contains all descendant control groups.
-    pub io_serviced_recursive: String,
+    pub io_serviced_recursive: Vec<IoService>,
+    /// Same as `io_serviced`, but contains all descendant control groups and contains only the
+    /// total amount.
+    pub io_serviced_recursive_total: u64,
     /// The total time spent between dispatch and request completion for I/O requests (as seen by
     /// the CFQ I/O scheduler) by the control group's tasks.
-    pub io_service_time: String,
+    pub io_service_time: Vec<IoService>,
+    /// Same as `io_service_time`, but contains all descendant control groups and contains only the
+    /// total amount.
+    pub io_service_time_total: u64,
     /// Same as `io_service_time`, but contains all descendant control groups.
-    pub io_service_time_recursive: String,
+    pub io_service_time_recursive: Vec<IoService>,
+    /// Same as `io_service_time_recursive`, but contains all descendant control groups and only
+    /// the total amount.
+    pub io_service_time_recursive_total: u64,
     /// Total amount of time spent waiting for a free slot in the CFQ I/O scheduler's queue.
-    pub io_wait_time: String,
+    pub io_wait_time: Vec<IoService>,
+    /// Same as `io_wait_time`, but only reports the total amount.
+    pub io_wait_time_total: u64,
     /// Same as `io_wait_time`, but contains all descendant control groups.
-    pub io_wait_time_recursive: String,
+    pub io_wait_time_recursive: Vec<IoService>,
+    /// Same as `io_wait_time_recursive`, but only reports the total amount.
+    pub io_wait_time_recursive_total: u64,
     /// How much weight do the control group's tasks have when competing against the descendant
     /// control group's tasks.
     pub leaf_weight: u64,
     /// Same as `leaf_weight`, but per-block-device.
-    pub leaf_weight_device: String,
+    pub leaf_weight_device: Vec<BlkIoData>,
     /// Total number of sectors transferred between the block devices and the control group's
     /// tasks.
-    pub sectors: String,
+    pub sectors: Vec<BlkIoData>,
     /// Same as `sectors`, but contains all descendant control groups.
-    pub sectors_recursive: String,
+    pub sectors_recursive: Vec<BlkIoData>,
     /// Similar statistics, but as seen by the throttle policy.
     pub throttle: BlkIoThrottle,
     /// The time the control group had access to the I/O devices.
-    pub time: String,
+    pub time: Vec<BlkIoData>,
     /// Same as `time`, but contains all descendant control groups.
-    pub time_recursive: String,
+    pub time_recursive: Vec<BlkIoData>,
     /// The weight of this control group.
     pub weight: u64,
     /// Same as `weight`, but per-block-device.
-    pub weight_device: String,
+    pub weight_device: Vec<BlkIoData>,
 }
 
-impl Controller for BlkIoController {
+impl ControllerInternal for BlkIoController {
-    fn control_type(self: &Self) -> Controllers { Controllers::BlkIo }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::BlkIo
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let res: &BlkIoResources = &res.blkio;
 
         if res.update_values {
@@ -110,8 +278,8 @@ impl Controller for BlkIoController {
             let _ = self.set_leaf_weight(res.leaf_weight as u64);
 
             for dev in &res.weight_device {
-                let _ = self.set_weight_for_device(format!("{}:{} {}",
+                let _ = self.set_weight_for_device(dev.major, dev.minor, dev.weight as u64);
-                                dev.major, dev.minor, dev.weight));
+                let _ = self.set_leaf_weight_for_device(dev.major, dev.minor, dev.leaf_weight as u64);
             }
 
             for dev in &res.throttle_read_bps_device {
@@ -130,6 +298,8 @@ impl Controller for BlkIoController {
                 let _ = self.throttle_write_iops_for_device(dev.major, dev.minor, dev.rate);
             }
         }
+
+        Ok(())
     }
 }
 
@@ -147,25 +317,25 @@ impl<'a> From<&'a Subsystem> for &'a BlkIoController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_string_from(mut file: File) -> Result<String, CgroupError> {
+fn read_string_from(mut file: File) -> Result<String> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
         Ok(_) => Ok(string.trim().to_string()),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -182,161 +352,492 @@ impl BlkIoController {
 
     /// Gathers statistics about and reports the state of the block devices used by the control
     /// group's tasks.
-    pub fn blkio(self: &Self) -> BlkIo {
+    pub fn blkio(&self) -> BlkIo {
         BlkIo {
-            io_merged: self.open_path("blkio.io_merged", false).and_then(|file| {
+            io_merged: self
-                read_string_from(file)
+                .open_path("blkio.io_merged", false)
-            }).unwrap_or("".to_string()),
+                .and_then(read_string_from)
-            io_merged_recursive: self.open_path("blkio.io_merged_recursive", false).and_then(|file| {
+                .and_then(parse_io_service)
-                read_string_from(file)
+                .unwrap_or(Vec::new()),
-            }).unwrap_or("".to_string()),
+            io_merged_total: self
-            io_queued: self.open_path("blkio.io_queued", false).and_then(|file| {
+                .open_path("blkio.io_merged", false)
-                read_string_from(file)
+                .and_then(read_string_from)
-            }).unwrap_or("".to_string()),
+                .and_then(parse_io_service_total)
-            io_queued_recursive: self.open_path("blkio.io_queued_recursive", false).and_then(|file| {
+                .unwrap_or(0),
-                read_string_from(file)
+            io_merged_recursive: self
-            }).unwrap_or("".to_string()),
+                .open_path("blkio.io_merged_recursive", false)
-            io_service_bytes: self.open_path("blkio.io_service_bytes", false).and_then(|file| {
+                .and_then(read_string_from)
-                read_string_from(file)
+                .and_then(parse_io_service)
-            }).unwrap_or("".to_string()),
+                .unwrap_or(Vec::new()),
-            io_service_bytes_recursive: self.open_path("blkio.io_service_bytes_recursive", false).and_then(|file| {
+            io_merged_recursive_total: self
-                read_string_from(file)
+                .open_path("blkio.io_merged_recursive", false)
-            }).unwrap_or("".to_string()),
+                .and_then(read_string_from)
-            io_serviced: self.open_path("blkio.io_serviced", false).and_then(|file| {
+                .and_then(parse_io_service_total)
-                read_string_from(file)
+                .unwrap_or(0),
-            }).unwrap_or("".to_string()),
+            io_queued: self
-            io_serviced_recursive: self.open_path("blkio.io_serviced_recursive", false).and_then(|file| {
+                .open_path("blkio.io_queued", false)
-                read_string_from(file)
+                .and_then(read_string_from)
-            }).unwrap_or("".to_string()),
+                .and_then(parse_io_service)
-            io_service_time: self.open_path("blkio.io_service_time", false).and_then(|file| {
+                .unwrap_or(Vec::new()),
-                read_string_from(file)
+            io_queued_total: self
-            }).unwrap_or("".to_string()),
+                .open_path("blkio.io_queued", false)
-            io_service_time_recursive: self.open_path("blkio.io_service_time_recursive", false).and_then(|file| {
+                .and_then(read_string_from)
-                read_string_from(file)
+                .and_then(parse_io_service_total)
-            }).unwrap_or("".to_string()),
+                .unwrap_or(0),
-            io_wait_time: self.open_path("blkio.io_wait_time", false).and_then(|file| {
+            io_queued_recursive: self
-                read_string_from(file)
+                .open_path("blkio.io_queued_recursive", false)
-            }).unwrap_or("".to_string()),
+                .and_then(read_string_from)
-            io_wait_time_recursive: self.open_path("blkio.io_wait_time_recursive", false).and_then(|file| {
+                .and_then(parse_io_service)
-                read_string_from(file)
+                .unwrap_or(Vec::new()),
-            }).unwrap_or("".to_string()),
+            io_queued_recursive_total: self
-            leaf_weight: self.open_path("blkio.leaf_weight", false).and_then(|file| {
+                .open_path("blkio.io_queued_recursive", false)
-                read_u64_from(file)
+                .and_then(read_string_from)
-            }).unwrap_or(0u64),
+                .and_then(parse_io_service_total)
-            leaf_weight_device: self.open_path("blkio.leaf_weight_device", false).and_then(|file| {
+                .unwrap_or(0),
-                read_string_from(file)
+            io_service_bytes: self
-            }).unwrap_or("".to_string()),
+                .open_path("blkio.io_service_bytes", false)
-            sectors: self.open_path("blkio.sectors", false).and_then(|file| {
+                .and_then(read_string_from)
-                read_string_from(file)
+                .and_then(parse_io_service)
-            }).unwrap_or("".to_string()),
+                .unwrap_or(Vec::new()),
-            sectors_recursive: self.open_path("blkio.sectors_recursive", false).and_then(|file| {
+            io_service_bytes_total: self
-                read_string_from(file)
+                .open_path("blkio.io_service_bytes", false)
-            }).unwrap_or("".to_string()),
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_service_bytes_recursive: self
+                .open_path("blkio.io_service_bytes_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_service_bytes_recursive_total: self
+                .open_path("blkio.io_service_bytes_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_serviced: self
+                .open_path("blkio.io_serviced", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_serviced_total: self
+                .open_path("blkio.io_serviced", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_serviced_recursive: self
+                .open_path("blkio.io_serviced_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_serviced_recursive_total: self
+                .open_path("blkio.io_serviced_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_service_time: self
+                .open_path("blkio.io_service_time", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_service_time_total: self
+                .open_path("blkio.io_service_time", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_service_time_recursive: self
+                .open_path("blkio.io_service_time_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_service_time_recursive_total: self
+                .open_path("blkio.io_service_time_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_wait_time: self
+                .open_path("blkio.io_wait_time", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_wait_time_total: self
+                .open_path("blkio.io_wait_time", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            io_wait_time_recursive: self
+                .open_path("blkio.io_wait_time_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service)
+                .unwrap_or(Vec::new()),
+            io_wait_time_recursive_total: self
+                .open_path("blkio.io_wait_time_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_io_service_total)
+                .unwrap_or(0),
+            leaf_weight: self
+                .open_path("blkio.leaf_weight", false)
+                .and_then(|file| read_u64_from(file))
+                .unwrap_or(0u64),
+            leaf_weight_device: self
+                .open_path("blkio.leaf_weight_device", false)
+                .and_then(read_string_from)
+                .and_then(parse_blkio_data)
+                .unwrap_or(Vec::new()),
+            sectors: self
+                .open_path("blkio.sectors", false)
+                .and_then(read_string_from)
+                .and_then(parse_blkio_data)
+                .unwrap_or(Vec::new()),
+            sectors_recursive: self
+                .open_path("blkio.sectors_recursive", false)
+                .and_then(read_string_from)
+                .and_then(parse_blkio_data)
+                .unwrap_or(Vec::new()),
             throttle: BlkIoThrottle {
-                io_service_bytes: self.open_path("blkio.throttle.io_service_bytes", false).and_then(|file| {
+                io_service_bytes: self
-                    read_string_from(file)
+                    .open_path("blkio.throttle.io_service_bytes", false)
-                }).unwrap_or("".to_string()),
+                    .and_then(read_string_from)
-                io_service_bytes_recursive: self.open_path("blkio.throttle.io_service_bytes_recursive", false).and_then(|file| {
+                    .and_then(parse_io_service)
-                    read_string_from(file)
+                    .unwrap_or(Vec::new()),
-                }).unwrap_or("".to_string()),
+                io_service_bytes_total: self
-                io_serviced: self.open_path("blkio.throttle.io_serviced", false).and_then(|file| {
+                    .open_path("blkio.throttle.io_service_bytes", false)
-                    read_string_from(file)
+                    .and_then(read_string_from)
-                }).unwrap_or("".to_string()),
+                    .and_then(parse_io_service_total)
-                io_serviced_recursive: self.open_path("blkio.throttle.io_serviced_recursive", false).and_then(|file| {
+                    .unwrap_or(0),
-                    read_string_from(file)
+                io_service_bytes_recursive: self
-                }).unwrap_or("".to_string()),
+                    .open_path("blkio.throttle.io_service_bytes_recursive", false)
-                read_bps_device: self.open_path("blkio.throttle.read_bps_device", false).and_then(|file| {
+                    .and_then(read_string_from)
-                    read_string_from(file)
+                    .and_then(parse_io_service)
-                }).unwrap_or("".to_string()),
+                    .unwrap_or(Vec::new()),
-                read_iops_device: self.open_path("blkio.throttle.read_iops_device", false).and_then(|file| {
+                io_service_bytes_recursive_total: self
-                    read_string_from(file)
+                    .open_path("blkio.throttle.io_service_bytes_recursive", false)
-                }).unwrap_or("".to_string()),
+                    .and_then(read_string_from)
-                write_bps_device: self.open_path("blkio.throttle.write_bps_device", false).and_then(|file| {
+                    .and_then(parse_io_service_total)
-                    read_string_from(file)
+                    .unwrap_or(0),
-                }).unwrap_or("".to_string()),
+                io_serviced: self
-                write_iops_device: self.open_path("blkio.throttle.write_iops_device", false).and_then(|file| {
+                    .open_path("blkio.throttle.io_serviced", false)
-                    read_string_from(file)
+                    .and_then(read_string_from)
-                }).unwrap_or("".to_string()),
+                    .and_then(parse_io_service)
+                    .unwrap_or(Vec::new()),
+                io_serviced_total: self
+                    .open_path("blkio.throttle.io_serviced", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_io_service_total)
+                    .unwrap_or(0),
+                io_serviced_recursive: self
+                    .open_path("blkio.throttle.io_serviced_recursive", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_io_service)
+                    .unwrap_or(Vec::new()),
+                io_serviced_recursive_total: self
+                    .open_path("blkio.throttle.io_serviced_recursive", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_io_service_total)
+                    .unwrap_or(0),
+                read_bps_device: self
+                    .open_path("blkio.throttle.read_bps_device", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_blkio_data)
+                    .unwrap_or(Vec::new()),
+                read_iops_device: self
+                    .open_path("blkio.throttle.read_iops_device", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_blkio_data)
+                    .unwrap_or(Vec::new()),
+                write_bps_device: self
+                    .open_path("blkio.throttle.write_bps_device", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_blkio_data)
+                    .unwrap_or(Vec::new()),
+                write_iops_device: self
+                    .open_path("blkio.throttle.write_iops_device", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_blkio_data)
+                    .unwrap_or(Vec::new()),
             },
-            time: self.open_path("blkio.time", false).and_then(|file| {
+            time: self
-                read_string_from(file)
+                .open_path("blkio.time", false)
-            }).unwrap_or("".to_string()),
+                .and_then(read_string_from)
-            time_recursive: self.open_path("blkio.time_recursive", false).and_then(|file| {
+                .and_then(parse_blkio_data)
-                read_string_from(file)
+                .unwrap_or(Vec::new()),
-            }).unwrap_or("".to_string()),
+            time_recursive: self
-            weight: self.open_path("blkio.weight", false).and_then(|file| {
+                .open_path("blkio.time_recursive", false)
-                read_u64_from(file)
+                .and_then(read_string_from)
-            }).unwrap_or(0u64),
+                .and_then(parse_blkio_data)
-            weight_device: self.open_path("blkio.weight_device", false).and_then(|file| {
+                .unwrap_or(Vec::new()),
-                read_string_from(file)
+            weight: self
-            }).unwrap_or("".to_string()),
+                .open_path("blkio.weight", false)
+                .and_then(|file| read_u64_from(file))
+                .unwrap_or(0u64),
+            weight_device: self
+                .open_path("blkio.weight_device", false)
+                .and_then(read_string_from)
+                .and_then(parse_blkio_data)
+                .unwrap_or(Vec::new()),
         }
     }
 
     /// Set the leaf weight on the control group's tasks, i.e., how are they weighted against the
     /// descendant control groups' tasks.
-    pub fn set_leaf_weight(self: &Self, w: u64) -> Result<(), CgroupError> {
+    pub fn set_leaf_weight(&self, w: u64) -> Result<()> {
-        self.open_path("blkio.leaf_weight", true).and_then(|mut file| {
+        self.open_path("blkio.leaf_weight", true)
-            file.write_all(w.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(w.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Same as `set_leaf_weight()`, but settable per each block device.
-    pub fn set_leaf_weight_for_device(self: &Self, d: String) -> Result<(), CgroupError> {
+    pub fn set_leaf_weight_for_device(
-        self.open_path("blkio.leaf_weight_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(d.as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        weight: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.leaf_weight_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, weight).as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Reset the statistics the kernel has gathered so far and start fresh.
-    pub fn reset_stats(self: &Self) -> Result<(), CgroupError> {
+    pub fn reset_stats(&self) -> Result<()> {
-        self.open_path("blkio.leaf_weight_device", true).and_then(|mut file| {
+        self.open_path("blkio.reset_stats", true)
-            file.write_all("1".to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all("1".to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Throttle the bytes per second rate of read operation affecting the block device
     /// `major:minor` to `bps`.
-    pub fn throttle_read_bps_for_device(self: &Self, major: u64, minor: u64, bps: u64) -> Result<(), CgroupError> {
+    pub fn throttle_read_bps_for_device(
-        self.open_path("blkio.throttle.read_bps_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(format!("{}:{} {}", major, minor, bps).to_string().as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        bps: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.throttle.read_bps_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, bps).to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Throttle the I/O operations per second rate of read operation affecting the block device
     /// `major:minor` to `bps`.
-    pub fn throttle_read_iops_for_device(self: &Self, major: u64, minor: u64, iops: u64) -> Result<(), CgroupError> {
+    pub fn throttle_read_iops_for_device(
-        self.open_path("blkio.throttle.read_iops_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(format!("{}:{} {}", major, minor, iops).to_string().as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        iops: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.throttle.read_iops_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, iops).to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
     /// Throttle the bytes per second rate of write operation affecting the block device
     /// `major:minor` to `bps`.
-    pub fn throttle_write_bps_for_device(self: &Self, major: u64, minor: u64, bps: u64) -> Result<(), CgroupError> {
+    pub fn throttle_write_bps_for_device(
-        self.open_path("blkio.throttle.write_bps_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(format!("{}:{} {}", major, minor, bps).to_string().as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        bps: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.throttle.write_bps_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, bps).to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Throttle the I/O operations per second rate of write operation affecting the block device
     /// `major:minor` to `bps`.
-    pub fn throttle_write_iops_for_device(self: &Self, major: u64, minor: u64, iops: u64) -> Result<(), CgroupError> {
+    pub fn throttle_write_iops_for_device(
-        self.open_path("blkio.throttle.write_iops_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(format!("{}:{} {}", major, minor, iops).to_string().as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        iops: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.throttle.write_iops_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, iops).to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Set the weight of the control group's tasks.
-    pub fn set_weight(self: &Self, w: u64) -> Result<(), CgroupError> {
+    pub fn set_weight(&self, w: u64) -> Result<()> {
-        self.open_path("blkio.leaf_weight", true).and_then(|mut file| {
+        self.open_path("blkio.weight", true)
-            file.write_all(w.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(w.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Same as `set_weight()`, but settable per each block device.
-    pub fn set_weight_for_device(self: &Self, d: String) -> Result<(), CgroupError> {
+    pub fn set_weight_for_device(
-        self.open_path("blkio.weight_device", true).and_then(|mut file| {
+        &self,
-            file.write_all(d.as_ref()).map_err(CgroupError::WriteError)
+        major: u64,
-        })
+        minor: u64,
+        weight: u64,
+    ) -> Result<()> {
+        self.open_path("blkio.weight_device", true)
+            .and_then(|mut file| {
+                file.write_all(format!("{}:{} {}", major, minor, weight).as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use blkio::{parse_blkio_data, BlkIoData};
+    use blkio::{parse_io_service, parse_io_service_total, IoService};
+    use error::*;
+
+    static TEST_VALUE: &str = "\
+8:32 Read 4280320
+8:32 Write 0
+8:32 Sync 4280320
+8:32 Async 0
+8:32 Total 4280320
+8:48 Read 5705479168
+8:48 Write 56096055296
+8:48 Sync 11213923328
+8:48 Async 50587611136
+8:48 Total 61801534464
+8:16 Read 10059776
+8:16 Write 0
+8:16 Sync 10059776
+8:16 Async 0
+8:16 Total 10059776
+8:0 Read 7192576
+8:0 Write 0
+8:0 Sync 7192576
+8:0 Async 0
+8:0 Total 7192576
+Total 61823067136
+ ";
+
+    static TEST_WRONG_VALUE: &str = "\
+8:32 Read 4280320
+8:32 Write 0
+8:32 Async 0
+8:32 Total 4280320 8:48 Read 5705479168
+8:48 Write 56096055296
+8:48 Sync 11213923328
+8:48 Async 50587611136
+8:48 Total 61801534464
+8:16 Read 10059776
+8:16 Write 0
+8:16 Sync 10059776
+8:16 Async 0
+8:16 Total 10059776
+8:0 Read 7192576
+8:0 Write 0
+8:0 Sync 7192576
+8:0 Async 0
+8:0 Total 7192576
+Total 61823067136
+ ";
+
+    static TEST_BLKIO_DATA: &str = "\
+8:48 454480833999
+8:32 228392923193
+8:16 772456885
+8:0 559583764
+ ";
+
+    #[test]
+    fn test_parse_io_service_total() {
+        let ok = parse_io_service_total(TEST_VALUE.to_string()).unwrap();
+        assert_eq!(
+            ok,
+            61823067136
+        );
+    }
+
+    #[test]
+    fn test_parse_io_service() {
+        let ok = parse_io_service(TEST_VALUE.to_string()).unwrap();
+        assert_eq!(
+            ok,
+            vec![
+                IoService {
+                    major: 8,
+                    minor: 32,
+                    read: 4280320,
+                    write: 0,
+                    sync: 4280320,
+                    async: 0,
+                    total: 4280320,
+                },
+                IoService {
+                    major: 8,
+                    minor: 48,
+                    read: 5705479168,
+                    write: 56096055296,
+                    sync: 11213923328,
+                    async: 50587611136,
+                    total: 61801534464,
+                },
+                IoService {
+                    major: 8,
+                    minor: 16,
+                    read: 10059776,
+                    write: 0,
+                    sync: 10059776,
+                    async: 0,
+                    total: 10059776,
+                },
+                IoService {
+                    major: 8,
+                    minor: 0,
+                    read: 7192576,
+                    write: 0,
+                    sync: 7192576,
+                    async: 0,
+                    total: 7192576,
+                }
+            ]
+        );
+        let err = parse_io_service(TEST_WRONG_VALUE.to_string()).unwrap_err();
+        assert_eq!(
+            err.kind(),
+            &ErrorKind::ParseError,
+        );
+    }
+
+    #[test]
+    fn test_parse_blkio_data() {
+        assert_eq!(
+            parse_blkio_data(TEST_BLKIO_DATA.to_string()).unwrap(),
+            vec![
+                BlkIoData {
+                    major: 8,
+                    minor: 48,
+                    data: 454480833999,
+                },
+                BlkIoData {
+                    major: 8,
+                    minor: 32,
+                    data: 228392923193,
+                },
+                BlkIoData {
+                    major: 8,
+                    minor: 16,
+                    data: 772456885,
+                },
+                BlkIoData {
+                    major: 8,
+                    minor: 0,
+                    data: 559583764,
+                }
+            ]
+        );
     }
 }

src/cgroup.rs

@@ -1,16 +1,18 @@
 //! This module handles cgroup operations. Start here!
 
-use {CgroupError, CgroupPid, Resources, ControllIdentifier, Controller, Hierarchy, Subsystem};
+use error::*;
+
+use {CgroupPid, ControllIdentifier, Controller, Hierarchy, Resources, Subsystem};
 
 use std::convert::From;
-
+use std::path::Path;
 
 /// A control group is the central structure to this crate.
 ///
 ///
 /// # What are control groups?
 ///
-/// Lifting over from the Linux kernel sources: 
+/// Lifting over from the Linux kernel sources:
 ///
 /// > Control Groups provide a mechanism for aggregating/partitioning sets of
 /// > tasks, and all their future children, into hierarchical groups with
@@ -26,9 +28,8 @@ pub struct Cgroup<'b> {
 }
 
 impl<'b> Cgroup<'b> {
-
     /// Create this control group.
-    fn create(self: &Self) {
+    fn create(&self) {
         for subsystem in &self.subsystems {
             subsystem.to_controller().create();
         }
@@ -40,7 +41,7 @@ impl<'b> Cgroup<'b> {
     ///
     /// Note that if the handle goes out of scope and is dropped, the control group is _not_
     /// destroyed.
-    pub fn new(hier: &Hierarchy, path: String) -> Cgroup {
+    pub fn new<P: AsRef<Path>>(hier: &Hierarchy, path: P) -> Cgroup {
         let cg = Cgroup::load(hier, path);
         cg.create();
         cg
@@ -53,10 +54,14 @@ impl<'b> Cgroup<'b> {
     ///
     /// Note that if the handle goes out of scope and is dropped, the control group is _not_
     /// destroyed.
-    pub fn load(hier: &Hierarchy, path: String) -> Cgroup {
+    pub fn load<P: AsRef<Path>>(hier: &Hierarchy, path: P) -> Cgroup {
+        let path = path.as_ref();
         let mut subsystems = hier.subsystems();
-        if path != ""  {
+        if path.as_os_str() != "" {
-            subsystems = subsystems.into_iter().map(|x| x.enter(&path)).collect::<Vec<_>>();
+            subsystems = subsystems
+                .into_iter()
+                .map(|x| x.enter(path))
+                .collect::<Vec<_>>();
         }
 
         let cg = Cgroup {
@@ -68,7 +73,7 @@ impl<'b> Cgroup<'b> {
     }
 
     /// The list of subsystems that this control group supports.
-    pub fn subsystems(self: &Self) -> &Vec<Subsystem> {
+    pub fn subsystems(&self) -> &Vec<Subsystem> {
         &self.subsystems
     }
 
@@ -78,31 +83,29 @@ impl<'b> Cgroup<'b> {
     /// system call will fail if there are any descendants. Thus, one should check whether it was
     /// actually removed, and remove the descendants first if not. In the future, this behavior
     /// will change.
-    pub fn delete(self: Self) {
+    pub fn delete(self) {
-        self.subsystems.into_iter().for_each(|sub| {
+        self.subsystems.into_iter().for_each(|sub| match sub {
-            match sub {
+            Subsystem::Pid(pidc) => pidc.delete(),
-                Subsystem::Pid(pidc) => pidc.delete(),
+            Subsystem::Mem(c) => c.delete(),
-                Subsystem::Mem(c) => c.delete(),
+            Subsystem::CpuSet(c) => c.delete(),
-                Subsystem::CpuSet(c) => c.delete(),
+            Subsystem::CpuAcct(c) => c.delete(),
-                Subsystem::CpuAcct(c) => c.delete(),
+            Subsystem::Cpu(c) => c.delete(),
-                Subsystem::Cpu(c) => c.delete(),
+            Subsystem::Devices(c) => c.delete(),
-                Subsystem::Devices(c) => c.delete(),
+            Subsystem::Freezer(c) => c.delete(),
-                Subsystem::Freezer(c) => c.delete(),
+            Subsystem::NetCls(c) => c.delete(),
-                Subsystem::NetCls(c) => c.delete(),
+            Subsystem::BlkIo(c) => c.delete(),
-                Subsystem::BlkIo(c) => c.delete(),
+            Subsystem::PerfEvent(c) => c.delete(),
-                Subsystem::PerfEvent(c) => c.delete(),
+            Subsystem::NetPrio(c) => c.delete(),
-                Subsystem::NetPrio(c) => c.delete(),
+            Subsystem::HugeTlb(c) => c.delete(),
-                Subsystem::HugeTlb(c) => c.delete(),
+            Subsystem::Rdma(c) => c.delete(),
-                Subsystem::Rdma(c) => c.delete(),
-            }
         });
     }
 
     /// Apply a set of resource limits to the control group.
-    pub fn apply(self: &Self, res: &Resources) {
+    pub fn apply(&self, res: &Resources) -> Result<()> {
-        for subsystem in &self.subsystems {
+        self.subsystems
-            subsystem.to_controller().apply(res);
+            .iter()
-        }
+            .try_fold((), |_, e| e.to_controller().apply(res))
     }
 
     /// Retrieve a container based on type inference.
@@ -116,15 +119,14 @@ impl<'b> Cgroup<'b> {
     ///                             .expect("No cpu controller attached!");
     /// ```
     pub fn controller_of<'a, T>(self: &'a Self) -> Option<&'a T>
-        where &'a T: From<&'a Subsystem>,
+    where
-                  T: Controller + ControllIdentifier,
+        &'a T: From<&'a Subsystem>,
+        T: Controller + ControllIdentifier,
     {
         for i in &self.subsystems {
             if i.to_controller().control_type() == T::controller_type() {
-                /*
+                // N.B.:
-                 * N.B.:
+                // https://play.rust-lang.org/?gist=978b2846bacebdaa00be62374f4f4334&version=stable&mode=debug&edition=2015
-                 * https://play.rust-lang.org/?gist=978b2846bacebdaa00be62374f4f4334&version=stable&mode=debug&edition=2015
-                 */
                 return Some(i.into());
             }
         }
@@ -135,25 +137,31 @@ impl<'b> Cgroup<'b> {
     ///
     /// Note that this means that the task will be moved back to the root control group in the
     /// hierarchy and any rules applied to that control group will _still_ apply to the task.
-    pub fn remove_task(self: &Self, pid: CgroupPid) {
+    pub fn remove_task(&self, pid: CgroupPid) {
         let _ = self.hier.root_control_group().add_task(pid);
     }
 
     /// Attach a task to the control group.
-    pub fn add_task(self: &Self, pid: CgroupPid) -> Result<(), CgroupError> {
+    pub fn add_task(&self, pid: CgroupPid) -> Result<()> {
-        self.subsystems().iter().try_for_each(|sub| sub.to_controller().add_task(&pid))
+        self.subsystems()
+            .iter()
+            .try_for_each(|sub| sub.to_controller().add_task(&pid))
     }
 
     /// Returns an Iterator that can be used to iterate over the tasks that are currently in the
     /// control group.
-    pub fn tasks(self: &Self) -> Vec<CgroupPid> {
+    pub fn tasks(&self) -> Vec<CgroupPid> {
-        /* Collect the tasks from all subsystems */
+        // Collect the tasks from all subsystems
-        let mut v = self.subsystems().iter()
+        let mut v = self
+            .subsystems()
+            .iter()
             .map(|x| x.to_controller().tasks())
-            .fold(vec![], |mut acc, mut x| { acc.append(&mut x); acc });
+            .fold(vec![], |mut acc, mut x| {
+                acc.append(&mut x);
+                acc
+            });
         v.sort();
         v.dedup();
         v
     }
-
 }

src/cgroup_builder.rs

@@ -0,0 +1,368 @@
+//! This module allows the user to create a control group using the Builder pattern.
+//! # Example
+//!
+//! The following example demonstrates how the control group builder looks like.  The user
+//! specifies the name of the control group (here: "hello") and the hierarchy it belongs to (here:
+//! a V1 hierarchy). Next, the user selects a subsystem by calling functions like `memory()`,
+//! `cpu()` and `devices()`. The user can then add restrictions and details via subsystem-specific
+//! calls. To finalize a subsystem, the user may call `done()`. Finally, if the control group build
+//! is done and all requirements/restrictions have been specified, the control group can be created
+//! by a call to `build()`.
+//!
+//! ```rust,no_run
+//! # use cgroups::*;
+//! # use cgroups::devices::*;
+//! # use cgroups::cgroup_builder::*;
+//! let v1 = cgroups::hierarchies::V1::new();
+//! let cgroup: Cgroup = CgroupBuilder::new("hello", &v1)
+//!      .memory()
+//!          .kernel_memory_limit(1024 * 1024)
+//!          .memory_hard_limit(1024 * 1024)
+//!          .done()
+//!      .cpu()
+//!          .shares(100)
+//!          .done()
+//!      .devices()
+//!          .device(1000, 10, DeviceType::Block, true,
+//!             vec![DevicePermissions::Read,
+//!                  DevicePermissions::Write,
+//!                  DevicePermissions::MkNod])
+//!          .device(6, 1, DeviceType::Char, false, vec![])
+//!          .done()
+//!      .network()
+//!          .class_id(1337)
+//!          .priority("eth0".to_string(), 100)
+//!          .priority("wl0".to_string(), 200)
+//!          .done()
+//!      .hugepages()
+//!          .limit("2M".to_string(), 0)
+//!          .limit("4M".to_string(), 4 * 1024 * 1024 * 100)
+//!          .limit("2G".to_string(), 2 * 1024 * 1024 * 1024)
+//!          .done()
+//!      .blkio()
+//!          .weight(123)
+//!          .leaf_weight(99)
+//!          .weight_device(6, 1, 100, 55)
+//!          .weight_device(6, 1, 100, 55)
+//!          .throttle_iops()
+//!              .read(6, 1, 10)
+//!              .write(11, 1, 100)
+//!          .throttle_bps()
+//!              .read(6, 1, 10)
+//!              .write(11, 1, 100)
+//!          .done()
+//!      .build();
+//! ```
+use error::*;
+
+use {pid, BlkIoDeviceResource, BlkIoDeviceThrottleResource,  Cgroup, DeviceResource, Hierarchy, HugePageResource, NetworkPriority, Resources};
+
+macro_rules! gen_setter {
+    ($res:ident, $cont:ident, $func:ident, $name:ident, $ty:ty) => {
+        /// See the similarly named function in the respective controller.
+        pub fn $name(mut self, $name: $ty) -> Self {
+            self.cgroup.resources.$res.update_values = true;
+            self.cgroup.resources.$res.$name = $name;
+            self
+        }
+    }
+}
+
+/// A control group builder instance
+pub struct CgroupBuilder<'a> {
+    name: String,
+    hierarchy: &'a Hierarchy,
+    /// Internal, unsupported field: use the associated builders instead.
+    resources: Resources,
+}
+
+impl<'a> CgroupBuilder<'a> {
+    /// Start building a control group with the supplied hierarchy and name pair.
+    ///
+    /// Note that this does not actually create the control group until `build()` is called.
+    pub fn new(name: &'a str, hierarchy: &'a Hierarchy) -> CgroupBuilder<'a> {
+        CgroupBuilder {
+            name: name.to_owned(),
+            hierarchy: hierarchy,
+            resources: Resources::default(),
+        }
+    }
+
+    /// Builds the memory resources of the control group.
+    pub fn memory(self) -> MemoryResourceBuilder<'a> {
+        MemoryResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the pid resources of the control group.
+    pub fn pid(self) -> PidResourceBuilder<'a> {
+        PidResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the cpu resources of the control group.
+    pub fn cpu(self) -> CpuResourceBuilder<'a> {
+        CpuResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the devices resources of the control group, disallowing or
+    /// allowing access to certain devices in the system.
+    pub fn devices(self) -> DeviceResourceBuilder<'a> {
+        DeviceResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the network resources of the control group, setting class id, or
+    /// various priorities on networking interfaces.
+    pub fn network(self) -> NetworkResourceBuilder<'a> {
+        NetworkResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the hugepage/hugetlb resources available to the control group.
+    pub fn hugepages(self) -> HugepagesResourceBuilder<'a> {
+        HugepagesResourceBuilder {
+            cgroup: self,
+        }
+    }
+
+    /// Builds the block I/O resources available for the control group.
+    pub fn blkio(self) -> BlkIoResourcesBuilder<'a> {
+        BlkIoResourcesBuilder {
+            cgroup: self,
+            throttling_iops: false,
+        }
+    }
+
+    /// Finalize the control group, consuming the builder and creating the control group.
+    pub fn build(self) -> Cgroup<'a> {
+        let cg = Cgroup::new(self.hierarchy, self.name);
+        cg.apply(&self.resources);
+        cg
+    }
+}
+
+/// A builder that configures the memory controller of a control group.
+pub struct MemoryResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> MemoryResourceBuilder<'a> {
+
+    gen_setter!(memory, MemController, set_kmem_limit, kernel_memory_limit, u64);
+    gen_setter!(memory, MemController, set_limit, memory_hard_limit, u64);
+    gen_setter!(memory, MemController, set_soft_limit, memory_soft_limit, u64);
+    gen_setter!(memory, MemController, set_tcp_limit, kernel_tcp_memory_limit, u64);
+    gen_setter!(memory, MemController, set_memswap_limit, memory_swap_limit, u64);
+    gen_setter!(memory, MemController, set_swappiness, swappiness, u64);
+
+    /// Finish the construction of the memory resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the pid controller of a control group.
+pub struct PidResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> PidResourceBuilder<'a> {
+
+    gen_setter!(pid, PidController, set_pid_max, maximum_number_of_processes, pid::PidMax);
+
+    /// Finish the construction of the pid resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the cpuset & cpu controllers of a control group.
+pub struct CpuResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> CpuResourceBuilder<'a> {
+
+    gen_setter!(cpu, CpuSetController, set_cpus, cpus, String);
+    gen_setter!(cpu, CpuSetController, set_mems, mems, String);
+    gen_setter!(cpu, CpuController, set_shares, shares, u64);
+    gen_setter!(cpu, CpuController, set_cfs_quota, quota, i64);
+    gen_setter!(cpu, CpuController, set_cfs_period, period, u64);
+    gen_setter!(cpu, CpuController, set_rt_runtime, realtime_runtime, i64);
+    gen_setter!(cpu, CpuController, set_rt_period, realtime_period, u64);
+
+    /// Finish the construction of the cpu resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the devices controller of a control group.
+pub struct DeviceResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> DeviceResourceBuilder<'a> {
+
+    /// Restrict (or allow) a device to the tasks inside the control group.
+    pub fn device(mut self,
+                  major: i64,
+                  minor: i64,
+                  devtype: ::devices::DeviceType,
+                  allow: bool,
+                  access: Vec<::devices::DevicePermissions>)
+            -> DeviceResourceBuilder<'a> {
+        self.cgroup.resources.devices.update_values = true;
+        self.cgroup.resources.devices.devices.push(DeviceResource {
+            major,
+            minor,
+            devtype,
+            allow,
+            access
+        });
+        self
+    }
+
+    /// Finish the construction of the devices resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the net_cls & net_prio controllers of a control group.
+pub struct NetworkResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> NetworkResourceBuilder<'a> {
+
+    gen_setter!(network, NetclsController, set_class, class_id, u64);
+
+    /// Set the priority of the tasks when operating on a networking device defined by `name` to be
+    /// `priority`.
+    pub fn priority(mut self, name: String, priority: u64)
+        -> NetworkResourceBuilder<'a> {
+        self.cgroup.resources.network.update_values = true;
+        self.cgroup.resources.network.priorities.push(NetworkPriority {
+            name,
+            priority,
+        });
+        self
+    }
+
+    /// Finish the construction of the network resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the hugepages controller of a control group.
+pub struct HugepagesResourceBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+}
+
+impl<'a> HugepagesResourceBuilder<'a> {
+
+    /// Limit the usage of certain hugepages (determined by `size`) to be at most `limit` bytes.
+    pub fn limit(mut self, size: String, limit: u64)
+        -> HugepagesResourceBuilder<'a> {
+        self.cgroup.resources.hugepages.update_values = true;
+        self.cgroup.resources.hugepages.limits.push(HugePageResource {
+            size,
+            limit,
+        });
+        self
+    }
+
+    /// Finish the construction of the network resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}
+
+/// A builder that configures the blkio controller of a control group.
+pub struct BlkIoResourcesBuilder<'a> {
+    cgroup: CgroupBuilder<'a>,
+    throttling_iops: bool,
+}
+
+impl<'a> BlkIoResourcesBuilder<'a> {
+
+    gen_setter!(blkio, BlkIoController, set_weight, weight, u16);
+    gen_setter!(blkio, BlkIoController, set_leaf_weight, leaf_weight, u16);
+
+    /// Set the weight of a certain device.
+    pub fn weight_device(mut self,
+                         major: u64,
+                         minor: u64,
+                         weight: u16,
+                         leaf_weight: u16)
+        -> BlkIoResourcesBuilder<'a> {
+        self.cgroup.resources.blkio.update_values = true;
+        self.cgroup.resources.blkio.weight_device.push(BlkIoDeviceResource {
+            major,
+            minor,
+            weight,
+            leaf_weight,
+        });
+        self
+    }
+
+    /// Start configuring the I/O operations per second metric.
+    pub fn throttle_iops(mut self) -> BlkIoResourcesBuilder<'a> {
+        self.throttling_iops = true;
+        self
+    }
+
+    /// Start configuring the bytes per second metric.
+    pub fn throttle_bps(mut self) -> BlkIoResourcesBuilder<'a> {
+        self.throttling_iops = false;
+        self
+    }
+
+    /// Limit the read rate of the current metric for a certain device.
+    pub fn read(mut self, major: u64, minor: u64, rate: u64)
+        -> BlkIoResourcesBuilder<'a> {
+        self.cgroup.resources.blkio.update_values = true;
+        let throttle = BlkIoDeviceThrottleResource {
+            major,
+            minor,
+            rate,
+        };
+        if self.throttling_iops {
+            self.cgroup.resources.blkio.throttle_read_iops_device.push(throttle);
+        } else {
+            self.cgroup.resources.blkio.throttle_read_bps_device.push(throttle);
+        }
+        self
+    }
+
+    /// Limit the write rate of the current metric for a certain device.
+    pub fn write(mut self, major: u64, minor: u64, rate: u64)
+        -> BlkIoResourcesBuilder<'a> {
+        self.cgroup.resources.blkio.update_values = true;
+        let throttle = BlkIoDeviceThrottleResource {
+            major,
+            minor,
+            rate,
+        };
+        if self.throttling_iops {
+            self.cgroup.resources.blkio.throttle_write_iops_device.push(throttle);
+        } else {
+            self.cgroup.resources.blkio.throttle_write_bps_device.push(throttle);
+        }
+        self
+    }
+
+    /// Finish the construction of the blkio resources of a control group.
+    pub fn done(self) -> CgroupBuilder<'a> {
+        self.cgroup
+    }
+}

src/cpu.rs

@@ -1,20 +1,26 @@
 //! This module contains the implementation of the `cpu` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/scheduler/sched-design-CFS.txt](https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt)
 //!  paragraph 7 ("GROUP SCHEDULER EXTENSIONS TO CFS").
-use std::path::PathBuf;
+use std::fs::File;
 use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, CpuResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, CpuResources, Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `cpu` subsystem of a Cgroup.
-/// 
+///
 /// In essence, it allows gathering information about how much the tasks inside the control group
 /// are using the CPU and creating rules that limit their usage. Note that this crate does not yet
 /// support managing realtime tasks.
 #[derive(Debug, Clone)]
-pub struct CpuController{
+pub struct CpuController {
     base: PathBuf,
     path: PathBuf,
 }
@@ -28,23 +34,48 @@ pub struct Cpu {
     pub stat: String,
 }
 
-impl Controller for CpuController {
+impl ControllerInternal for CpuController {
-    fn control_type(self: &Self) -> Controllers { Controllers::Cpu}
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::Cpu
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn get_path(&self) -> &PathBuf {
-        /* get the resources that apply to this controller */
+        &self.path
+    }
+
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
+
+    fn apply(&self, res: &Resources) -> Result<()> {
+        // get the resources that apply to this controller
         let res: &CpuResources = &res.cpu;
 
         if res.update_values {
-            /* apply pid_max */
+            // apply pid_max
             let _ = self.set_shares(res.shares);
+            if self.shares()? != res.shares as u64 {
+                return Err(Error::new(ErrorKind::Other));
+            }
+
             let _ = self.set_cfs_period(res.period);
+            if self.cfs_period()? != res.period as u64 {
+                return Err(Error::new(ErrorKind::Other));
+            }
+
             let _ = self.set_cfs_quota(res.quota as u64);
-            /* TODO: rt properties (CONFIG_RT_GROUP_SCHED) are not yet supported */
+            if self.cfs_quota()? != res.quota as u64 {
+                return Err(Error::new(ErrorKind::Other));
+            }
+
+            // TODO: rt properties (CONFIG_RT_GROUP_SCHED) are not yet supported
         }
+
+        Ok(())
     }
 }
 
@@ -62,12 +93,20 @@ impl<'a> From<&'a Subsystem> for &'a CpuController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
+fn read_u64_from(mut file: File) -> Result<u64> {
+    let mut string = String::new();
+    match file.read_to_string(&mut string) {
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
+    }
+}
+
 impl CpuController {
     /// Contructs a new `CpuController` with `oroot` serving as the root of the control group.
     pub fn new(oroot: PathBuf) -> Self {
@@ -80,44 +119,71 @@ impl CpuController {
     }
 
     /// Returns CPU time statistics based on the processes in the control group.
-    pub fn cpu(self: &Self) -> Cpu {
+    pub fn cpu(&self) -> Cpu {
         Cpu {
-            stat: self.open_path("cpu.stat", false).and_then(|mut file| {
+            stat: self
-                let mut s = String::new();
+                .open_path("cpu.stat", false)
-                let res = file.read_to_string(&mut s);
+                .and_then(|mut file| {
-                match res {
+                    let mut s = String::new();
-                    Ok(_) => Ok(s),
+                    let res = file.read_to_string(&mut s);
-                    Err(e) => Err(CgroupError::ReadError(e)),
+                    match res {
-                }
+                        Ok(_) => Ok(s),
-            }).unwrap_or("".to_string()),
+                        Err(e) => Err(Error::with_cause(ReadFailed, e)),
+                    }
+                }).unwrap_or("".to_string()),
         }
     }
 
     /// Configures the CPU bandwidth (in relative relation to other control groups and this control
     /// group's parent).
-    /// 
+    ///
     /// For example, setting control group `A`'s `shares` to `100`, and control group `B`'s
     /// `shares` to `200` ensures that control group `B` receives twice as much as CPU bandwidth.
     /// (Assuming both `A` and `B` are of the same parent)
-    pub fn set_shares(self: &Self, shares: u64) -> Result<(), CgroupError> {
+    pub fn set_shares(&self, shares: u64) -> Result<()> {
         self.open_path("cpu.shares", true).and_then(|mut file| {
-            file.write_all(shares.to_string().as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(shares.to_string().as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
+    /// Retrieve the CPU bandwidth that this control group (relative to other control groups and
+    /// this control group's parent) can use.
+    pub fn shares(&self) -> Result<u64> {
+        self.open_path("cpu.shares", false).and_then(read_u64_from)
+    }
+
     /// Specify a period (when using the CFS scheduler) of time in microseconds for how often this
     /// control group's access to the CPU should be reallocated.
-    pub fn set_cfs_period(self: &Self, us: u64) -> Result<(), CgroupError> {
+    pub fn set_cfs_period(&self, us: u64) -> Result<()> {
-        self.open_path("cpu.cfs_period_us", true).and_then(|mut file| {
+        self.open_path("cpu.cfs_period_us", true)
-            file.write_all(us.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(us.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
+    /// Retrieve the period of time of how often this cgroup's access to the CPU should be
+    /// reallocated in microseconds.
+    pub fn cfs_period(&self) -> Result<u64> {
+        self.open_path("cpu.cfs_period_us", false)
+            .and_then(read_u64_from)
     }
 
     /// Specify a quota (when using the CFS scheduler) of time in microseconds for which all tasks
     /// in this control group can run during one period (see: `set_cfs_period()`).
-    pub fn set_cfs_quota(self: &Self, us: u64) -> Result<(), CgroupError> {
+    pub fn set_cfs_quota(&self, us: u64) -> Result<()> {
-        self.open_path("cpu.cfs_quota_us", true).and_then(|mut file| {
+        self.open_path("cpu.cfs_quota_us", true)
-            file.write_all(us.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(us.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
+    /// Retrieve the quota of time for which all tasks in this cgroup can run during one period, in
+    /// microseconds.
+    pub fn cfs_quota(&self) -> Result<u64> {
+        self.open_path("cpu.cfs_quota_us", false)
+            .and_then(read_u64_from)
     }
 }

src/cpuacct.rs

@@ -1,12 +1,15 @@
 //! This module contains the implementation of the `cpuacct` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/cpuacct.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/cpuacct.txt)
-use std::path::PathBuf;
-use std::io::{Read, Write};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, Controllers, Resources, Subsystem, ControllIdentifier, Controller};
+use error::*;
+use error::ErrorKind::*;
+
+use {ControllIdentifier, ControllerInternal, Controllers, Resources, Subsystem};
 
 /// A controller that allows controlling the `cpuacct` subsystem of a Cgroup.
 ///
@@ -49,13 +52,22 @@ pub struct CpuAcct {
     pub usage_user: u64,
 }
 
-impl Controller for CpuAcctController {
+impl ControllerInternal for CpuAcctController {
-    fn control_type(self: &Self) -> Controllers { Controllers::CpuAcct }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::CpuAcct
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, _res: &Resources) {
+    fn apply(&self, _res: &Resources) -> Result<()> {
+        Ok(())
     }
 }
 
@@ -73,34 +85,33 @@ impl<'a> From<&'a Subsystem> for &'a CpuAcctController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     let res = file.read_to_string(&mut string);
     match res {
         Ok(_) => match string.trim().parse() {
             Ok(e) => Ok(e),
-            Err(_) => Err(CgroupError::ParseError),
+            Err(e) => Err(Error::with_cause(ParseError, e)),
         },
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
-fn read_string_from(mut file: File) -> Result<String, CgroupError> {
+fn read_string_from(mut file: File) -> Result<String> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
         Ok(_) => Ok(string.trim().to_string()),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
 impl CpuAcctController {
-
     /// Contructs a new `CpuAcctController` with `oroot` serving as the root of the control group.
     pub fn new(oroot: PathBuf) -> Self {
         let mut root = oroot;
@@ -112,34 +123,46 @@ impl CpuAcctController {
     }
 
     /// Gathers the statistics that are available in the control group into a `CpuAcct` structure.
-    pub fn cpuacct(self: &Self) -> CpuAcct {
+    pub fn cpuacct(&self) -> CpuAcct {
         CpuAcct {
-            stat: self.open_path("cpuacct.stat", false)
+            stat: self
-                    .and_then(|file| read_string_from(file)).unwrap_or("".to_string()),
+                .open_path("cpuacct.stat", false)
-            usage: self.open_path("cpuacct.usage", false)
+                .and_then(|file| read_string_from(file))
-                    .and_then(|file| read_u64_from(file))
+                .unwrap_or("".to_string()),
-                    .unwrap_or(0),
+            usage: self
-            usage_all: self.open_path("cpuacct.usage_all", false)
+                .open_path("cpuacct.usage", false)
-                    .and_then(|file| read_string_from(file)).unwrap_or("".to_string()),
+                .and_then(|file| read_u64_from(file))
-            usage_percpu: self.open_path("cpuacct.usage_percpu", false)
+                .unwrap_or(0),
-                    .and_then(|file| read_string_from(file)).unwrap_or("".to_string()),
+            usage_all: self
-            usage_percpu_sys: self.open_path("cpuacct.usage_percpu_sys", false)
+                .open_path("cpuacct.usage_all", false)
-                    .and_then(|file| read_string_from(file)).unwrap_or("".to_string()),
+                .and_then(|file| read_string_from(file))
-            usage_percpu_user: self.open_path("cpuacct.usage_percpu_user", false)
+                .unwrap_or("".to_string()),
-                    .and_then(|file| read_string_from(file)).unwrap_or("".to_string()),
+            usage_percpu: self
-            usage_sys: self.open_path("cpuacct.usage_sys", false)
+                .open_path("cpuacct.usage_percpu", false)
-                    .and_then(|file| read_u64_from(file))
+                .and_then(|file| read_string_from(file))
-                    .unwrap_or(0),
+                .unwrap_or("".to_string()),
-            usage_user: self.open_path("cpuacct.usage_user", false)
+            usage_percpu_sys: self
-                    .and_then(|file| read_u64_from(file))
+                .open_path("cpuacct.usage_percpu_sys", false)
-                    .unwrap_or(0),
+                .and_then(|file| read_string_from(file))
+                .unwrap_or("".to_string()),
+            usage_percpu_user: self
+                .open_path("cpuacct.usage_percpu_user", false)
+                .and_then(|file| read_string_from(file))
+                .unwrap_or("".to_string()),
+            usage_sys: self
+                .open_path("cpuacct.usage_sys", false)
+                .and_then(|file| read_u64_from(file))
+                .unwrap_or(0),
+            usage_user: self
+                .open_path("cpuacct.usage_user", false)
+                .and_then(|file| read_u64_from(file))
+                .unwrap_or(0),
         }
     }
 
     /// Reset the statistics the kernel has gathered about the control group.
-    pub fn reset(self: &Self) -> Result<(), CgroupError> {
+    pub fn reset(&self) -> Result<()> {
-        self.open_path("cpuacct.usage", true).and_then(|mut file| {
+        self.open_path("cpuacct.usage", true)
-            file.write_all(b"0").map_err(CgroupError::WriteError)
+            .and_then(|mut file| file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e)))
-        })
     }
 }

src/cpuset.rs

@@ -1,16 +1,20 @@
 //! This module contains the implementation of the `cpuset` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/cpusets.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/cpusets.txt)
-use std::path::PathBuf;
-use std::io::{Read, Write};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, CpuResources, Resources, Controller, ControllIdentifier, Subsystem, Controllers};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, CpuResources, Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `cpuset` subsystem of a Cgroup.
-/// 
+///
 /// In essence, this controller is responsible for restricting the tasks in the control group to a
 /// set of CPUs and/or memory nodes.
 #[derive(Debug, Clone)]
@@ -23,17 +27,19 @@ pub struct CpuSetController {
 pub struct CpuSet {
     /// If true, no other control groups can share the CPUs listed in the `cpus` field.
     pub cpu_exclusive: bool,
-    /// The list of CPUs the tasks of the control group can run on. This is a comma-separated list
+    /// The list of CPUs the tasks of the control group can run on.
-    /// with dashes between numbers representing ranges.
+    ///
-    pub cpus: String,
+    /// This is a vector of `(start, end)` tuples, where each tuple is a range of CPUs where the
+    /// control group is allowed to run on. Both sides of the range are inclusive.
+    pub cpus: Vec<(u64, u64)>,
     /// The list of CPUs that the tasks can effectively run on. This removes the list of CPUs that
     /// the parent (and all of its parents) cannot run on from the `cpus` field of this control
     /// group.
-    pub effective_cpus: String,
+    pub effective_cpus: Vec<(u64, u64)>,
     /// The list of memory nodes that the tasks can effectively use. This removes the list of nodes that
     /// the parent (and all of its parents) cannot use from the `mems` field of this control
     /// group.
-    pub effective_mems: String,
+    pub effective_mems: Vec<(u64, u64)>,
     /// If true, no other control groups can share the memory nodes listed in the `mems` field.
     pub mem_exclusive: bool,
     /// If true, the control group is 'hardwalled'. Kernel memory allocations (except for a few
@@ -48,13 +54,14 @@ pub struct CpuSet {
     /// the memory pressure for control groups or not.
     pub memory_pressure_enabled: Option<bool>,
     /// If true, filesystem buffers are spread across evenly between the nodes specified in `mems`.
-    pub memory_spread_page: bool, 
+    pub memory_spread_page: bool,
     /// If true, kernel slab caches for file I/O are spread across evenly between the nodes
     /// specified in `mems`.
-    pub memory_spread_slab: bool, 
+    pub memory_spread_slab: bool,
-    /// The list of memory nodes the tasks of the control group can use. This is a comma-separated list
+    /// The list of memory nodes the tasks of the control group can use.
-    /// with dashes between numbers representing ranges.
+    ///
-    pub mems: String,
+    /// The format is the same as the `cpus`, `effective_cpus` and `effective_mems` fields.
+    pub mems: Vec<(u64, u64)>,
     /// If true, the kernel will attempt to rebalance the load between the CPUs specified in the
     /// `cpus` field of this control group.
     pub sched_load_balance: bool,
@@ -70,24 +77,32 @@ pub struct CpuSet {
     /// |           5          | Immediately balance the load between CPUs even if the system is NUMA |
     /// |           6          | Immediately balance the load between all CPUs |
     pub sched_relax_domain_level: u64,
-
 }
 
-impl Controller for CpuSetController {
+impl ControllerInternal for CpuSetController {
-    fn control_type(self: &Self) -> Controllers { Controllers::CpuSet }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::CpuSet
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let res: &CpuResources = &res.cpu;
 
         if res.update_values {
-            /* apply pid_max */
             let _ = self.set_cpus(&res.cpus);
             let _ = self.set_mems(&res.mems);
         }
+
+        Ok(())
     }
 }
 
@@ -105,28 +120,65 @@ impl<'a> From<&'a Subsystem> for &'a CpuSetController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_string_from(mut file: File) -> Result<String, CgroupError> {
+fn read_string_from(mut file: File) -> Result<String> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
         Ok(_) => Ok(string.trim().to_string()),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
+/// Parse a string like "1,2,4-5,8" into a list of (start, end) tuples.
+fn parse_range(s: String) -> Result<Vec<(u64, u64)>> {
+    let mut fin = Vec::new();
+
+    if s == "".to_string() {
+        return Ok(fin);
+    }
+
+    // first split by commas
+    let comma_split = s.split(",");
+
+    for sp in comma_split {
+        if sp.contains("-") {
+            // this is a true range
+            let dash_split = sp.split("-").collect::<Vec<_>>();
+            if dash_split.len() != 2 {
+                return Err(Error::new(ParseError));
+            }
+            let first = dash_split[0].parse::<u64>();
+            let second = dash_split[1].parse::<u64>();
+            if first.is_err() || second.is_err() {
+                return Err(Error::new(ParseError));
+            }
+            fin.push((first.unwrap(), second.unwrap()));
+        } else {
+            // this is just a single number
+            let num = sp.parse::<u64>();
+            if num.is_err() {
+                return Err(Error::new(ParseError));
+            }
+            fin.push((num.clone().unwrap(), num.clone().unwrap()));
+        }
+    }
+
+    Ok(fin)
+}
+
 impl CpuSetController {
     /// Contructs a new `CpuSetController` with `oroot` serving as the root of the control group.
     pub fn new(oroot: PathBuf) -> Self {
@@ -140,58 +192,88 @@ impl CpuSetController {
 
     /// Returns the statistics gathered by the kernel for this control group. See the struct for
     /// more information on what information this entails.
-    pub fn cpuset(self: &Self) -> CpuSet {
+    pub fn cpuset(&self) -> CpuSet {
         CpuSet {
             cpu_exclusive: {
-                self.open_path("cpuset.cpu_exclusive", false).and_then(|file| {
+                self.open_path("cpuset.cpu_exclusive", false)
-                    read_u64_from(file)
+                    .and_then(|file| read_u64_from(file))
-                }).map(|x| x == 1).unwrap_or(false)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             cpus: {
-                self.open_path("cpuset.cpus", false).and_then(read_string_from).unwrap_or("".to_string())
+                self.open_path("cpuset.cpus", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_range)
+                    .unwrap_or(Vec::new())
             },
             effective_cpus: {
-                self.open_path("cpuset.effective_cpus", false).and_then(read_string_from).unwrap_or("".to_string())
+                self.open_path("cpuset.effective_cpus", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_range)
+                    .unwrap_or(Vec::new())
             },
             effective_mems: {
-                self.open_path("cpuset.effective_mems", false).and_then(read_string_from).unwrap_or("".to_string())
+                self.open_path("cpuset.effective_mems", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_range)
+                    .unwrap_or(Vec::new())
             },
             mem_exclusive: {
-                self.open_path("cpuset.mem_exclusive", false).and_then(read_u64_from)
+                self.open_path("cpuset.mem_exclusive", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             mem_hardwall: {
-                self.open_path("cpuset.mem_hardwall", false).and_then(read_u64_from)
+                self.open_path("cpuset.mem_hardwall", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             memory_migrate: {
-                self.open_path("cpuset.memory_migrate", false).and_then(read_u64_from)
+                self.open_path("cpuset.memory_migrate", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             memory_pressure: {
-                self.open_path("cpuset.memory_pressure", false).and_then(read_u64_from).unwrap_or(0)
+                self.open_path("cpuset.memory_pressure", false)
+                    .and_then(read_u64_from)
+                    .unwrap_or(0)
             },
             memory_pressure_enabled: {
-                self.open_path("cpuset.memory_pressure_enabled", false).and_then(read_u64_from)
+                self.open_path("cpuset.memory_pressure_enabled", false)
-                    .map(|x| x == 1).ok()
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .ok()
             },
             memory_spread_page: {
-                self.open_path("cpuset.memory_spread_page", false).and_then(read_u64_from)
+                self.open_path("cpuset.memory_spread_page", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             memory_spread_slab: {
-                self.open_path("cpuset.memory_spread_slab", false).and_then(read_u64_from)
+                self.open_path("cpuset.memory_spread_slab", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             mems: {
-                self.open_path("cpuset.mems", false).and_then(read_string_from).unwrap_or("".to_string())
+                self.open_path("cpuset.mems", false)
+                    .and_then(read_string_from)
+                    .and_then(parse_range)
+                    .unwrap_or(Vec::new())
             },
             sched_load_balance: {
-                self.open_path("cpuset.sched_load_balance", false).and_then(read_u64_from)
+                self.open_path("cpuset.sched_load_balance", false)
-                    .map(|x| x == 1).unwrap_or(false)
+                    .and_then(read_u64_from)
+                    .map(|x| x == 1)
+                    .unwrap_or(false)
             },
             sched_relax_domain_level: {
-                self.open_path("cpuset.sched_relax_domain_level", false).and_then(read_u64_from)
+                self.open_path("cpuset.sched_relax_domain_level", false)
+                    .and_then(read_u64_from)
                     .unwrap_or(0)
             },
         }
@@ -199,44 +281,48 @@ impl CpuSetController {
 
     /// Control whether the CPUs selected via `set_cpus()` should be exclusive to this control
     /// group or not.
-    pub fn set_cpu_exclusive(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_cpu_exclusive(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.cpu_exclusive", true).and_then(|mut file| {
+        self.open_path("cpuset.cpu_exclusive", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Control whether the memory nodes selected via `set_memss()` should be exclusive to this control
     /// group or not.
-    pub fn set_mem_exclusive(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_mem_exclusive(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.mem_exclusive", true).and_then(|mut file| {
+        self.open_path("cpuset.mem_exclusive", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Set the CPUs that the tasks in this control group can run on.
     ///
     /// Syntax is a comma separated list of CPUs, with an additional extension that ranges can
     /// be represented via dashes.
-    pub fn set_cpus(self: &Self, cpus: &String) -> Result<(), CgroupError> {
+    pub fn set_cpus(&self, cpus: &str) -> Result<()> {
         self.open_path("cpuset.cpus", true).and_then(|mut file| {
-            file.write_all(cpus.as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(cpus.as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
     /// Set the memory nodes that the tasks in this control group can use.
     ///
     /// Syntax is the same as with `set_cpus()`.
-    pub fn set_mems(self: &Self, mems: &String) -> Result<(), CgroupError> {
+    pub fn set_mems(&self, mems: &str) -> Result<()> {
         self.open_path("cpuset.mems", true).and_then(|mut file| {
-            file.write_all(mems.as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(mems.as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
@@ -245,86 +331,127 @@ impl CpuSetController {
     ///
     /// Note that some kernel allocations, most notably those that are made in interrupt handlers
     /// may disregard this.
-    pub fn set_hardwall(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_hardwall(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.mem_hardwall", true).and_then(|mut file| {
+        self.open_path("cpuset.mem_hardwall", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Controls whether the kernel should attempt to rebalance the load between the CPUs specified in the
     /// `cpus` field of this control group.
-    pub fn set_load_balancing(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_load_balancing(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.sched_load_balance", true).and_then(|mut file| {
+        self.open_path("cpuset.sched_load_balance", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Contorl how much effort the kernel should invest in rebalacing the control group.
     ///
     /// See @CpuSet 's similar field for more information.
-    pub fn set_rebalance_relax_domain_level(self: &Self, i: i64) -> Result<(), CgroupError> {
+    pub fn set_rebalance_relax_domain_level(&self, i: i64) -> Result<()> {
-        self.open_path("cpuset.sched_relax_domain_level", true).and_then(|mut file| {
+        self.open_path("cpuset.sched_relax_domain_level", true)
-            file.write_all(i.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(i.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Control whether when using `set_mems()` the existing memory used by the tasks should be
     /// migrated over to the now-selected nodes.
-    pub fn set_memory_migration(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_memory_migration(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.memory_migrate", true).and_then(|mut file| {
+        self.open_path("cpuset.memory_migrate", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Control whether filesystem buffers should be evenly split across the nodes selected via
     /// `set_mems()`.
-    pub fn set_memory_spread_page(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_memory_spread_page(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.memory_spread_page", true).and_then(|mut file| {
+        self.open_path("cpuset.memory_spread_page", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Control whether the kernel's slab cache for file I/O should be evenly split across the
     /// nodes selected via `set_mems()`.
-    pub fn set_memory_spread_slab(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_memory_spread_slab(&self, b: bool) -> Result<()> {
-        self.open_path("cpuset.memory_spread_slab", true).and_then(|mut file| {
+        self.open_path("cpuset.memory_spread_slab", true)
-            if b {
+            .and_then(|mut file| {
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+                if b {
-            } else {
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                } else {
-            }
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                }
+            })
     }
 
     /// Control whether the kernel should collect information to calculate memory pressure for
     /// control groups.
     ///
-    /// Note: This is a no-operation if the control group referred by `self` is not the root
+    /// Note: This will fail with `InvalidOperation` if the current congrol group is not the root
     /// control group.
-    pub fn set_enable_memory_pressure(self: &Self, b: bool) -> Result<(), CgroupError> {
+    pub fn set_enable_memory_pressure(&self, b: bool) -> Result<()> {
-        /* XXX: this file should only be present in the root cpuset cg */
+        if !self.path_exists("cpuset.memory_pressure_enabled") {
-        self.open_path("cpuset.memory_pressure_enabled", true).and_then(|mut file| {
+            return Err(Error::new(InvalidOperation));
-            if b {
+        }
-                file.write_all(b"1").map_err(CgroupError::WriteError)
+        self.open_path("cpuset.memory_pressure_enabled", true)
-            } else {
+            .and_then(|mut file| {
-                file.write_all(b"0").map_err(CgroupError::WriteError)
+                if b {
-            }
+                    file.write_all(b"1").map_err(|e| Error::with_cause(WriteFailed, e))
-        })
+                } else {
+                    file.write_all(b"0").map_err(|e| Error::with_cause(WriteFailed, e))
+                }
+            })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use cpuset;
+    #[test]
+    fn test_parse_range() {
+        let test_cases = vec![
+            "1,2,4-6,9".to_string(),
+            "".to_string(),
+            "1".to_string(),
+            "1-111".to_string(),
+            "1,2,3,4".to_string(),
+            "1-5,6-7,8-9".to_string(),
+        ];
+        let expecteds = vec![
+            vec![(1, 1), (2, 2), (4, 6), (9, 9)],
+            vec![],
+            vec![(1, 1)],
+            vec![(1, 111)],
+            vec![(1, 1), (2, 2), (3, 3), (4, 4)],
+            vec![(1, 5), (6, 7), (8, 9)],
+        ];
+
+        for (i, case) in test_cases.into_iter().enumerate() {
+            let range = cpuset::parse_range(case.clone());
+            println!("{:?} => {:?}", case, range);
+            assert!(range.is_ok());
+            assert_eq!(range.unwrap(), expecteds[i]);
+        }
     }
 }

src/devices.rs

@@ -1,43 +1,165 @@
 //! This module contains the implementation of the `devices` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/devices.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/devices.txt)
-use std::path::PathBuf;
 use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, DeviceResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, DeviceResource, DeviceResources,
+    Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `devices` subsystem of a Cgroup.
 ///
 /// In essence, using the devices controller, it is possible to allow or disallow sets of devices to
 /// be used by the control group's tasks.
 #[derive(Debug, Clone)]
-pub struct DevicesController{
+pub struct DevicesController {
     base: PathBuf,
     path: PathBuf,
 }
 
-impl Controller for DevicesController {
+/// An enum holding the different types of devices that can be manipulated using this controller.
-    fn control_type(self: &Self) -> Controllers { Controllers::Devices }
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+pub enum DeviceType {
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    /// The rule applies to all devices.
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    All,
+    /// The rule only applies to character devices.
+    Char,
+    /// The rule only applies to block devices.
+    Block,
+}
 
-    fn apply(self: &Self, res: &Resources) {
+impl Default for DeviceType {
-        /* get the resources that apply to this controller */
+    fn default() -> Self {
+        DeviceType::All
+    }
+}
+
+impl DeviceType {
+    /// Convert a DeviceType into the character that the kernel recognizes.
+    pub fn to_char(&self) -> char {
+        match self {
+            DeviceType::All => 'a',
+            DeviceType::Char => 'c',
+            DeviceType::Block => 'b',
+        }
+    }
+
+    /// Convert the kenrel's representation into the DeviceType type.
+    pub fn from_char(c: Option<char>) -> Option<DeviceType> {
+        match c {
+            Some('a') => Some(DeviceType::All),
+            Some('c') => Some(DeviceType::Char),
+            Some('b') => Some(DeviceType::Block),
+            _ => None,
+        }
+    }
+}
+
+/// An enum with the permissions that can be allowed/denied to the control group.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum DevicePermissions {
+    /// Permission to read from the device.
+    Read,
+    /// Permission to write to the device.
+    Write,
+    /// Permission to execute the `mknod(2)` system call with the device's major and minor numbers.
+    /// That is, the permission to create a special file that refers to the device node.
+    MkNod,
+}
+
+impl DevicePermissions {
+    /// Convert a DevicePermissions into the character that the kernel recognizes.
+    pub fn to_char(&self) -> char {
+        match self {
+            DevicePermissions::Read => 'r',
+            DevicePermissions::Write => 'w',
+            DevicePermissions::MkNod => 'm',
+        }
+    }
+
+    /// Convert a char to a DevicePermission if there is such a mapping.
+    pub fn from_char(c: char) -> Option<DevicePermissions> {
+        match c {
+            'r' => Some(DevicePermissions::Read),
+            'w' => Some(DevicePermissions::Write),
+            'm' => Some(DevicePermissions::MkNod),
+            _ => None,
+        }
+    }
+
+    /// Checks whether the string is a valid descriptor of DevicePermissions.
+    pub fn is_valid(s: &str) -> bool {
+        if s == "" {
+            return false;
+        }
+        for i in s.chars() {
+            if i != 'r' && i != 'w' && i != 'm' {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /// Returns a Vec will all the permissions that a device can have.
+    pub fn all() -> Vec<DevicePermissions> {
+        vec![
+            DevicePermissions::Read,
+            DevicePermissions::Write,
+            DevicePermissions::MkNod,
+        ]
+    }
+
+    /// Convert a string into DevicePermissions.
+    pub fn from_str(s: &str) -> Result<Vec<DevicePermissions>> {
+        let mut v = Vec::new();
+        if s == "" {
+            return Ok(v);
+        }
+        for e in s.chars() {
+            let perm = DevicePermissions::from_char(e)
+                .ok_or_else(|| Error::new(ParseError))?;
+            v.push(perm);
+        }
+
+        Ok(v)
+    }
+}
+
+impl ControllerInternal for DevicesController {
+    fn control_type(&self) -> Controllers {
+        Controllers::Devices
+    }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
+
+    fn apply(&self, res: &Resources) -> Result<()> {
+        // get the resources that apply to this controller
         let res: &DeviceResources = &res.devices;
 
         if res.update_values {
             for i in &res.devices {
-                let wstr = format!("{} {}:{} {}",
-                                   i.devtype, i.major, i.minor, i.access);
                 if i.allow {
-                    let _ = self.allow_device(&wstr);
+                    let _ = self.allow_device(i.devtype, i.major, i.minor, &i.access);
                 } else {
-                    let _ = self.deny_device(&wstr);
+                    let _ = self.deny_device(i.devtype, i.major, i.minor, &i.access);
                 }
             }
         }
+
+        Ok(())
     }
 }
 
@@ -55,7 +177,7 @@ impl<'a> From<&'a Subsystem> for &'a DevicesController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
@@ -74,42 +196,110 @@ impl DevicesController {
 
     /// Allow a (possibly, set of) device(s) to be used by the tasks in the control group.
     ///
-    /// The format of `dev` is rather simple:
+    /// When `-1` is passed as `major` or `minor`, the kernel interprets that value as "any",
-    /// `$type $major:$minor $rwm`
+    /// meaning that it will match any device.
-    /// where `$rwm` is a combination of the characters `r`, `w`, `m`, each standing for read,
+    pub fn allow_device(
-    /// write, mknod permissions.
+        &self,
-    ///
+        devtype: DeviceType,
-    /// Note that `dev` can be "regex"-like: both `$major` and `$minor` can be `*` which implies
+        major: i64,
-    /// that their value does not matter.
+        minor: i64,
-    pub fn allow_device(self: &Self, dev: &String) -> Result<(), CgroupError> {
+        perm: &Vec<DevicePermissions>,
+    ) -> Result<()> {
+        let perms = perm
+            .iter()
+            .map(DevicePermissions::to_char)
+            .collect::<String>();
+        let minor = if minor == -1 {
+            "*".to_string()
+        } else {
+            format!("{}", minor)
+        };
+        let major = if major == -1 {
+            "*".to_string()
+        } else {
+            format!("{}", major)
+        };
+        let final_str = format!("{} {}:{} {}", devtype.to_char(), major, minor, perms);
         self.open_path("devices.allow", true).and_then(|mut file| {
-            file.write_all(dev.as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(final_str.as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
     /// Deny the control group's tasks access to the devices covered by `dev`.
     ///
-    /// The format of `dev` is rather simple:
+    /// When `-1` is passed as `major` or `minor`, the kernel interprets that value as "any",
-    /// `$type $major:$minor $rwm`
+    /// meaning that it will match any device.
-    /// where `$rwm` is a combination of the characters `r`, `w`, `m`, each standing for read,
+    pub fn deny_device(
-    /// write, mknod permissions.
+        &self,
-    ///
+        devtype: DeviceType,
-    /// Note that `dev` can be "regex"-like: both `$major` and `$minor` can be `*` which implies
+        major: i64,
-    /// that their value does not matter.
+        minor: i64,
-    pub fn deny_device(self: &Self, dev: &String) -> Result<(), CgroupError> {
+        perm: &Vec<DevicePermissions>,
+    ) -> Result<()> {
+        let perms = perm
+            .iter()
+            .map(DevicePermissions::to_char)
+            .collect::<String>();
+        let minor = if minor == -1 {
+            "*".to_string()
+        } else {
+            format!("{}", minor)
+        };
+        let major = if major == -1 {
+            "*".to_string()
+        } else {
+            format!("{}", major)
+        };
+        let final_str = format!("{} {}:{} {}", devtype.to_char(), major, minor, perms);
         self.open_path("devices.deny", true).and_then(|mut file| {
-            file.write_all(dev.as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(final_str.as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
     /// Get the current list of allowed devices.
-    pub fn allowed_devices(self: &Self) -> Result<String, CgroupError> {
+    pub fn allowed_devices(&self) -> Result<Vec<DeviceResource>> {
         self.open_path("devices.list", false).and_then(|mut file| {
             let mut s = String::new();
             let res = file.read_to_string(&mut s);
             match res {
-                Ok(_) => Ok(s),
+                Ok(_) => {
-                Err(e) => Err(CgroupError::ReadError(e)),
+                    s.lines().fold(Ok(Vec::new()), |acc, line| {
+                        let ls = line.to_string().split(|c| c == ' ' || c == ':').map(|x| x.to_string()).collect::<Vec<String>>();
+                        if acc.is_err() || ls.len() != 4 {
+                            error!("allowed_devices: acc: {:?}, ls: {:?}", acc, ls);
+                            Err(Error::new(ParseError))
+                        } else {
+                            let devtype = DeviceType::from_char(ls[0].chars().nth(0));
+                            let mut major = ls[1].parse::<i64>();
+                            let mut minor = ls[2].parse::<i64>();
+                            if major.is_err() && ls[1] == "*".to_string() {
+                                major = Ok(-1);
+                            }
+                            if minor.is_err() && ls[2] == "*".to_string() {
+                                minor = Ok(-1);
+                            }
+                            if devtype.is_none() || major.is_err() || minor.is_err() || !DevicePermissions::is_valid(&ls[3]) {
+                                error!("allowed_devices: acc: {:?}, ls: {:?}, devtype: {:?}, major {:?} minor {:?} ls3 {:?}",
+                                         acc, ls, devtype, major, minor, &ls[3]);
+                                Err(Error::new(ParseError))
+                            } else {
+                                let access = DevicePermissions::from_str(&ls[3])?;
+                                let mut acc = acc.unwrap();
+                                acc.push(DeviceResource {
+                                    allow: true,
+                                    devtype: devtype.unwrap(),
+                                    major: major.unwrap(),
+                                    minor: minor.unwrap(),
+                                    access: access,
+                                });
+                                Ok(acc)
+                            }
+                        }
+                    })
+                },
+                Err(e) => Err(Error::with_cause(ReadFailed, e)),
             }
         })
     }

src/error.rs

@@ -0,0 +1,87 @@
+use std::error::Error as StdError;
+use std::fmt;
+
+/// The different types of errors that can occur while manipulating control groups.
+#[derive(Debug, Eq, PartialEq)]
+pub enum ErrorKind {
+    /// An error occured while writing to a control group file.
+    WriteFailed,
+
+    /// An error occured while trying to read from a control group file.
+    ReadFailed,
+
+    /// An error occured while trying to parse a value from a control group file.
+    ///
+    /// In the future, there will be some information attached to this field.
+    ParseError,
+
+    /// You tried to do something invalid.
+    ///
+    /// This could be because you tried to set a value in a control group that is not a root
+    /// control group. Or, when using unified hierarchy, you tried to add a task in a leaf node.
+    InvalidOperation,
+
+    /// The path of the control group was invalid.
+    ///
+    /// This could be caused by trying to escape the control group filesystem via a string of "..".
+    /// This crate checks against this and operations will fail with this error.
+    InvalidPath,
+
+    /// An unknown error has occured.
+    Other,
+}
+
+#[derive(Debug)]
+pub struct Error {
+    kind: ErrorKind,
+    cause: Option<Box<StdError + Send>>,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let msg = match self.kind {
+            ErrorKind::WriteFailed => "unable to write to a control group file",
+            ErrorKind::ReadFailed => "unable to read a control group file",
+            ErrorKind::ParseError => "unable to parse control group file",
+            ErrorKind::InvalidOperation => "the requested operation is invalid",
+            ErrorKind::InvalidPath => "the given path is invalid",
+            ErrorKind::Other => "an unknown error",
+        };
+
+        write!(f, "{}", msg)
+    }
+}
+
+impl StdError for Error {
+    fn cause(&self) -> Option<&StdError> {
+        match self.cause {
+            Some(ref x) => Some(&**x),
+            None => None,
+        }
+    }
+}
+
+impl Error {
+    pub(crate) fn new(kind: ErrorKind) -> Self {
+        Self {
+            kind,
+            cause: None,
+        }
+    }
+
+    pub(crate) fn with_cause<E>(kind: ErrorKind, cause: E) -> Self
+    where
+        E: 'static + Send + StdError,
+    {
+        Self {
+            kind,
+            cause: Some(Box::new(cause)),
+        }
+    }
+
+    pub fn kind(&self) -> &ErrorKind {
+        &self.kind
+    }
+}
+
+pub type Result<T> = ::std::result::Result<T, Error>;

src/freezer.rs

@@ -1,11 +1,14 @@
 //! This module contains the implementation of the `freezer` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/freezer-subsystem.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
-use std::path::PathBuf;
 use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
+use error::ErrorKind::*;
+
+use {ControllIdentifier, ControllerInternal, Controllers, Resources, Subsystem};
 
 /// A controller that allows controlling the `freezer` subsystem of a Cgroup.
 ///
@@ -16,7 +19,7 @@ use {CgroupError, Controllers, Controller, Resources, ControllIdentifier, Subsys
 /// Note that if the control group is currently in the `Frozen` or `Freezing` state, then no
 /// processes can be added to it.
 #[derive(Debug, Clone)]
-pub struct FreezerController{
+pub struct FreezerController {
     base: PathBuf,
     path: PathBuf,
 }
@@ -31,13 +34,22 @@ pub enum FreezerState {
     Frozen,
 }
 
-impl Controller for FreezerController {
+impl ControllerInternal for FreezerController {
-    fn control_type(self: &Self) -> Controllers { Controllers::Freezer }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::Freezer
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, _res: &Resources) {
+    fn apply(&self, _res: &Resources) -> Result<()> {
+        Ok(())
     }
 }
 
@@ -55,7 +67,7 @@ impl<'a> From<&'a Subsystem> for &'a FreezerController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
@@ -73,21 +85,23 @@ impl FreezerController {
     }
 
     /// Freezes the processes in the control group.
-    pub fn freeze(self: &Self) -> Result<(), CgroupError> {
+    pub fn freeze(&self) -> Result<()> {
         self.open_path("freezer.state", true).and_then(|mut file| {
-            file.write_all("FROZEN".to_string().as_ref()).map_err(CgroupError::WriteError)
+            file.write_all("FROZEN".to_string().as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
     /// Thaws, that is, unfreezes the processes in the control group.
-    pub fn thaw(self: &Self) -> Result<(), CgroupError> {
+    pub fn thaw(&self) -> Result<()> {
         self.open_path("freezer.state", true).and_then(|mut file| {
-            file.write_all("THAWED".to_string().as_ref()).map_err(CgroupError::WriteError)
+            file.write_all("THAWED".to_string().as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 
     /// Retrieve the state of processes in the control group.
-    pub fn state(self: &Self) -> Result<FreezerState, CgroupError> {
+    pub fn state(&self) -> Result<FreezerState> {
         self.open_path("freezer.state", false).and_then(|mut file| {
             let mut s = String::new();
             let res = file.read_to_string(&mut s);
@@ -96,9 +110,9 @@ impl FreezerController {
                     "FROZEN" => Ok(FreezerState::Frozen),
                     "THAWED" => Ok(FreezerState::Thawed),
                     "FREEZING" => Ok(FreezerState::Freezing),
-                    _ => Err(CgroupError::ParseError),
+                    _ => Err(Error::new(ParseError)),
                 },
-                Err(e) => Err(CgroupError::ReadError(e)),
+                Err(e) => Err(Error::with_cause(ReadFailed, e)),
             }
         })
     }

src/hierarchies.rs

@@ -3,28 +3,27 @@
 //! Currently, we only support the cgroupv1 hierarchy, but in the future we will add support for
 //! the Unified Hierarchy.
 
+use std::fs::File;
 use std::io::BufRead;
 use std::io::BufReader;
-use std::fs::File;
 use std::path::{Path, PathBuf};
 
+use blkio::BlkIoController;
+use cpu::CpuController;
+use cpuacct::CpuAcctController;
+use cpuset::CpuSetController;
+use devices::DevicesController;
+use freezer::FreezerController;
+use hugetlb::HugeTlbController;
+use memory::MemController;
+use net_cls::NetClsController;
+use net_prio::NetPrioController;
+use perf_event::PerfEventController;
+use pid::PidController;
+use rdma::RdmaController;
 use {Controllers, Hierarchy, Subsystem};
-use ::pid::PidController;
-use ::memory::MemController;
-use ::cpuset::CpuSetController;
-use ::cpuacct::CpuAcctController;
-use ::cpu::CpuController;
-use ::freezer::FreezerController;
-use ::devices::DevicesController;
-use ::net_cls::NetClsController;
-use ::blkio::BlkIoController;
-use ::perf_event::PerfEventController;
-use ::net_prio::NetPrioController;
-use ::hugetlb::HugeTlbController;
-use ::rdma::RdmaController;
-
-use ::cgroup::Cgroup;
 
+use cgroup::Cgroup;
 
 /// The standard, original cgroup implementation. Often referred to as "cgroupv1".
 pub struct V1 {
@@ -32,7 +31,7 @@ pub struct V1 {
 }
 
 impl Hierarchy for V1 {
-    fn subsystems(self: &Self) -> Vec<Subsystem> {
+    fn subsystems(&self) -> Vec<Subsystem> {
         let mut subs = vec![];
         if self.check_support(Controllers::Pids) {
             subs.push(Subsystem::Pid(PidController::new(self.root())));
@@ -77,11 +76,11 @@ impl Hierarchy for V1 {
         subs
     }
 
-    fn root_control_group(self: &Self) -> Cgroup {
+    fn root_control_group(&self) -> Cgroup {
         Cgroup::load(self, "".to_string())
     }
 
-    fn check_support(self: &Self, sub: Controllers) -> bool {
+    fn check_support(&self, sub: Controllers) -> bool {
         let root = self.root().read_dir().unwrap();
         for entry in root {
             if let Ok(entry) = entry {
@@ -93,7 +92,7 @@ impl Hierarchy for V1 {
         return false;
     }
 
-    fn root(self: &Self) -> PathBuf {
+    fn root(&self) -> PathBuf {
         PathBuf::from(self.mount_point.clone())
     }
 }
@@ -110,10 +109,10 @@ impl V1 {
 }
 
 fn find_v1_mount() -> Option<String> {
-    /* Open mountinfo so we can get a parseable mount list */
+    // Open mountinfo so we can get a parseable mount list
     let mountinfo_path = Path::new("/proc/self/mountinfo");
 
-    /* If /proc isn't mounted, or something else happens, then bail out */
+    // If /proc isn't mounted, or something else happens, then bail out
     if mountinfo_path.exists() == false {
         return None;
     }
@@ -128,7 +127,7 @@ fn find_v1_mount() -> Option<String> {
         let fstype = more_fields[0];
         if fstype == "tmpfs" && more_fields[2].contains("ro") {
             let cgroups_mount = fields.nth(4).unwrap();
-            println!("found cgroups at {:?}", cgroups_mount);
+            info!("found cgroups at {:?}", cgroups_mount);
             return Some(cgroups_mount.to_string());
         }
     }

src/hugetlb.rs

@@ -1,14 +1,18 @@
 //! This module contains the implementation of the `hugetlb` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/hugetlb.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/hugetlb.txt)
-use std::path::PathBuf;
 use std::fs::File;
-use std::io::{Write, Read};
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, HugePageResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
 
+use {
+    ControllIdentifier, ControllerInternal, Controllers, HugePageResources, Resources,
+    Subsystem,
+};
 
 /// A controller that allows controlling the `hugetlb` subsystem of a Cgroup.
 ///
@@ -20,21 +24,33 @@ pub struct HugeTlbController {
     path: PathBuf,
 }
 
-impl Controller for HugeTlbController {
+impl ControllerInternal for HugeTlbController {
-    fn control_type(self: &Self) -> Controllers { Controllers::HugeTlb }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::HugeTlb
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let res: &HugePageResources = &res.hugepages;
 
         if res.update_values {
             for i in &res.limits {
                 let _ = self.set_limit_in_bytes(&i.size, i.limit);
+                if self.limit_in_bytes(&i.size)? != i.limit {
+                    return Err(Error::new(Other));
+                }
             }
         }
+        Ok(())
     }
 }
 
@@ -52,17 +68,17 @@ impl<'a> From<&'a Subsystem> for &'a HugeTlbController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -78,44 +94,47 @@ impl HugeTlbController {
     }
 
     /// Whether the system supports `hugetlb_size` hugepages.
-    pub fn size_supported(self: &Self, _hugetlb_size: String) -> bool {
+    pub fn size_supported(&self, _hugetlb_size: &str) -> bool {
-        /* TODO */
+        // TODO
         true
     }
 
     /// Check how many times has the limit of `hugetlb_size` hugepages been hit.
-    pub fn failcnt(self: &Self, hugetlb_size: &String) -> Result<u64, CgroupError> {
+    pub fn failcnt(&self, hugetlb_size: &str) -> Result<u64> {
         self.open_path(&format!("hugetlb.{}.failcnt", hugetlb_size), false)
             .and_then(read_u64_from)
     }
 
     /// Get the limit (in bytes) of how much memory can be backed by hugepages of a certain size
     /// (`hugetlb_size`).
-    pub fn limit_in_bytes(self: &Self, hugetlb_size: &String) -> Result<u64, CgroupError> {
+    pub fn limit_in_bytes(&self, hugetlb_size: &str) -> Result<u64> {
         self.open_path(&format!("hugetlb.{}.limit_in_bytes", hugetlb_size), false)
             .and_then(read_u64_from)
     }
 
     /// Get the current usage of memory that is backed by hugepages of a certain size
     /// (`hugetlb_size`).
-    pub fn usage_in_bytes(self: &Self, hugetlb_size: &String) -> Result<u64, CgroupError> {
+    pub fn usage_in_bytes(&self, hugetlb_size: &str) -> Result<u64> {
         self.open_path(&format!("hugetlb.{}.usage_in_bytes", hugetlb_size), false)
             .and_then(read_u64_from)
     }
 
     /// Get the maximum observed usage of memory that is backed by hugepages of a certain size
     /// (`hugetlb_size`).
-    pub fn max_usage_in_bytes(self: &Self, hugetlb_size: &String) -> Result<u64, CgroupError> {
+    pub fn max_usage_in_bytes(&self, hugetlb_size: &str) -> Result<u64> {
-        self.open_path(&format!("hugetlb.{}.max_usage_in_bytes", hugetlb_size), false)
+        self.open_path(
-            .and_then(read_u64_from)
+            &format!("hugetlb.{}.max_usage_in_bytes", hugetlb_size),
+            false,
+        ).and_then(read_u64_from)
     }
 
     /// Set the limit (in bytes) of how much memory can be backed by hugepages of a certain size
     /// (`hugetlb_size`).
-    pub fn set_limit_in_bytes(self: &Self, hugetlb_size: &String, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_limit_in_bytes(&self, hugetlb_size: &str, limit: u64) -> Result<()> {
-        self.open_path(&format!("hugetlb.{}.limit_in_bytes", hugetlb_size), false)
+        self.open_path(&format!("hugetlb.{}.limit_in_bytes", hugetlb_size), true)
             .and_then(|mut file| {
-                file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
             })
     }
 }

src/lib.rs

@@ -1,35 +1,41 @@
-use std::path::PathBuf;
+#[macro_use]
+extern crate log;
+
 use std::fs::File;
 use std::io::{BufRead, BufReader, Write};
+use std::path::{Path, PathBuf};
 
-pub mod hierarchies;
-pub mod pid;
-pub mod memory;
-pub mod cpuset;
-pub mod cpuacct;
-pub mod cpu;
-pub mod devices;
-pub mod cgroup;
-pub mod freezer;
-pub mod net_cls;
 pub mod blkio;
-pub mod perf_event;
+pub mod cgroup;
-pub mod net_prio;
+pub mod cpu;
+pub mod cpuacct;
+pub mod cpuset;
+pub mod devices;
+pub mod error;
+pub mod freezer;
+pub mod hierarchies;
 pub mod hugetlb;
+pub mod memory;
+pub mod net_cls;
+pub mod net_prio;
+pub mod perf_event;
+pub mod pid;
 pub mod rdma;
+pub mod cgroup_builder;
 
-use pid::PidController;
-use memory::MemController;
-use cpuset::CpuSetController;
-use cpuacct::CpuAcctController;
-use cpu::CpuController;
-use freezer::FreezerController;
-use devices::DevicesController;
-use net_cls::NetClsController;
 use blkio::BlkIoController;
-use perf_event::PerfEventController;
+use cpu::CpuController;
-use net_prio::NetPrioController;
+use cpuacct::CpuAcctController;
+use cpuset::CpuSetController;
+use devices::DevicesController;
+use error::*;
+use freezer::FreezerController;
 use hugetlb::HugeTlbController;
+use memory::MemController;
+use net_cls::NetClsController;
+use net_prio::NetPrioController;
+use perf_event::PerfEventController;
+use pid::PidController;
 use rdma::RdmaController;
 
 pub use cgroup::Cgroup;
@@ -65,29 +71,6 @@ pub enum Subsystem {
     Rdma(RdmaController),
 }
 
-/// The different types of errors that can occur while manipulating control groups.
-#[derive(Debug)]
-pub enum CgroupError {
-    /// An error occured while writing to a control group file.
-    WriteError(std::io::Error),
-    /// An error occured while trying to read from a control group file.
-    ReadError(std::io::Error),
-    /// An error occured while trying to parse a value from a control group file.
-    ///
-    /// In the future, there will be some information attached to this field.
-    ParseError,
-    /// You tried to do something invalid.
-    ///
-    /// This could be because you tried to set a value in a control group that is not a root
-    /// control group. Or, when using unified hierarchy, you tried to add a task in a leaf node.
-    InvalidOperation,
-    /// The path of the control group was invalid.
-    ///
-    /// This could be caused by trying to escape the control group filesystem via a string of "..".
-    /// This crate checks against this and operations will fail with this error.
-    InvalidPath,
-}
-
 #[doc(hidden)]
 #[derive(Eq, PartialEq, Debug)]
 pub enum Controllers {
@@ -107,7 +90,7 @@ pub enum Controllers {
 }
 
 impl Controllers {
-    pub fn to_string(self: &Self) -> String {
+    pub fn to_string(&self) -> String {
         match self {
             Controllers::Pids => return "pids".to_string(),
             Controllers::Mem => return "memory".to_string(),
@@ -126,93 +109,148 @@ impl Controllers {
     }
 }
 
+mod sealed {
+    use super::*;
+
+    pub trait ControllerInternal {
+        fn apply(&self, res: &Resources) -> Result<()>;
+
+        // meta stuff
+        fn control_type(&self) -> Controllers;
+        fn get_path(&self) -> &PathBuf;
+        fn get_path_mut(&mut self) -> &mut PathBuf;
+        fn get_base(&self) -> &PathBuf;
+
+        fn verify_path(&self) -> Result<()> {
+            if self.get_path().starts_with(self.get_base()) {
+                Ok(())
+            } else {
+                Err(Error::new(ErrorKind::InvalidPath))
+            }
+        }
+
+        fn open_path(&self, p: &str, w: bool) -> Result<File> {
+            let mut path = self.get_path().clone();
+            path.push(p);
+
+            self.verify_path()?;
+
+            if w {
+                match File::create(&path) {
+                    Err(e) => return Err(Error::with_cause(ErrorKind::WriteFailed, e)),
+                    Ok(file) => return Ok(file),
+                }
+            } else {
+                match File::open(&path) {
+                    Err(e) => return Err(Error::with_cause(ErrorKind::ReadFailed, e)),
+                    Ok(file) => return Ok(file),
+                }
+            }
+        }
+
+        #[doc(hidden)]
+        fn path_exists(&self, p: &str) -> bool {
+            if let Err(_) = self.verify_path() {
+                return false;
+            }
+
+            std::path::Path::new(p).exists()
+        }
+
+    }
+}
+
+pub(crate) use sealed::ControllerInternal;
+
 /// A Controller is a subsystem attached to the control group.
 ///
 /// Implementors are able to control certain aspects of a control group.
 pub trait Controller {
+    #[doc(hidden)]
+    fn control_type(&self) -> Controllers;
+
+    /// The file system path to the controller.
+    fn path(&self) -> &Path;
+
     /// Apply a set of resources to the Controller, invoking its internal functions to pass the
     /// kernel the information.
-    fn apply(self: &Self, res: &Resources);
+    fn apply(&self, res: &Resources) -> Result<()>;
 
-    /* meta stuff */
+    /// Create this controller
-    #[doc(hidden)]
+    fn create(&self);
-    fn control_type(self: &Self) -> Controllers;
-    #[doc(hidden)]
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf;
-    #[doc(hidden)]
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf;
-    #[doc(hidden)]
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf;
 
-    #[doc(hidden)]
+    /// Does this controller already exist?
-    fn verify_path(self: &Self) -> bool {
+    fn exists(&self) -> bool;
-        self.get_path().starts_with(self.get_base())
+
+    /// Delete the controller.
+    fn delete(&self);
+
+    /// Attach a task to this controller.
+    fn add_task(&self, pid: &CgroupPid) -> Result<()>;
+
+    /// Get the list of tasks that this controller has.
+    fn tasks(&self) -> Vec<CgroupPid>;
+}
+
+impl<T> Controller for T where T: ControllerInternal {
+    fn control_type(&self) -> Controllers {
+        ControllerInternal::control_type(self)
+    }
+
+    fn path(&self) -> &Path {
+        self.get_path()
+    }
+
+    /// Apply a set of resources to the Controller, invoking its internal functions to pass the
+    /// kernel the information.
+    fn apply(&self, res: &Resources) -> Result<()> {
+        ControllerInternal::apply(self, res)
     }
 
     /// Create this controller
-    fn create(self: &Self) {
+    fn create(&self) {
-        if self.verify_path() {
+        self.verify_path().expect("path should be valid");
-            match ::std::fs::create_dir(self.get_path()) {
+
-                Ok(_) => (),
+        match ::std::fs::create_dir(self.get_path()) {
-                Err(e) => println!("error create_dir {:?}", e),
+            Ok(_) => (),
-            }
+            Err(e) => warn!("error create_dir {:?}", e),
         }
     }
 
     /// Does this controller already exist?
-    fn exists(self: &Self) -> bool {
+    fn exists(&self) -> bool {
         self.get_path().exists()
     }
 
     /// Delete the controller.
-    fn delete(self: &Self) {
+    fn delete(&self) {
         if self.get_path().exists() {
             let _ = ::std::fs::remove_dir(self.get_path());
         }
     }
 
-    #[doc(hidden)]
-    fn open_path(self: &Self, p: &str, w: bool) -> Result<File, CgroupError> {
-        let mut path = self.get_path().clone();
-        path.push(p);
-
-        if !self.verify_path() {
-            return Err(CgroupError::InvalidPath);
-        }
-
-        if w {
-            match File::create(&path) {
-                Err(e) => return Err(CgroupError::WriteError(e)),
-                Ok(file) => return Ok(file),
-            }
-        } else {
-            match File::open(&path) {
-                Err(e) => return Err(CgroupError::ReadError(e)),
-                Ok(file) => return Ok(file),
-            }
-        }
-    }
-
     /// Attach a task to this controller.
-    fn add_task(self: &Self, pid: &CgroupPid) -> Result<(), CgroupError> {
+    fn add_task(&self, pid: &CgroupPid) -> Result<()> {
         self.open_path("tasks", true).and_then(|mut file| {
-            file.write_all(pid.pid.to_string().as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(pid.pid.to_string().as_ref())
+                .map_err(|e| Error::with_cause(ErrorKind::WriteFailed, e))
         })
     }
 
     /// Get the list of tasks that this controller has.
-    fn tasks(self: &Self) -> Vec<CgroupPid> {
+    fn tasks(&self) -> Vec<CgroupPid> {
-        self.open_path("tasks", false).and_then(|file| {
+        self.open_path("tasks", false)
-            let bf = BufReader::new(file);
+            .and_then(|file| {
-            let mut v = Vec::new();
+                let bf = BufReader::new(file);
-            for line in bf.lines() {
+                let mut v = Vec::new();
-                if let Ok(line) = line {
+                for line in bf.lines() {
-                    let n = line.trim().parse().unwrap_or(0u64);
+                    if let Ok(line) = line {
-                    v.push(n);
+                        let n = line.trim().parse().unwrap_or(0u64);
+                        v.push(n);
+                    }
                 }
-            }
+                Ok(v.into_iter().map(CgroupPid::from).collect())
-            Ok(v.into_iter().map(CgroupPid::from).collect())
+            }).unwrap_or(vec![])
-        }).unwrap_or(vec![])
     }
 }
 
@@ -225,19 +263,19 @@ pub trait ControllIdentifier {
 /// implemented as well).
 pub trait Hierarchy {
     /// Returns what subsystems are supported by the hierarchy.
-    fn subsystems(self: &Self) -> Vec<Subsystem>;
+    fn subsystems(&self) -> Vec<Subsystem>;
 
     /// Returns the root directory of the hierarchy.
-    fn root(self: &Self) -> PathBuf;
+    fn root(&self) -> PathBuf;
 
     /// Return a handle to the root control group in the hierarchy.
-    fn root_control_group(self: &Self) -> Cgroup;
+    fn root_control_group(&self) -> Cgroup;
 
     /// Checks whether a certain subsystem is supported in the hierarchy.
     ///
     /// This is an internal function and should not be used.
     #[doc(hidden)]
-    fn check_support(self: &Self, sub: Controllers) -> bool;
+    fn check_support(&self, sub: Controllers) -> bool;
 }
 
 /// Resource limits for the memory subsystem.
@@ -282,14 +320,14 @@ pub struct PidResources {
 pub struct CpuResources {
     /// Whether values should be applied to the controller.
     pub update_values: bool,
-    /* cpuset */
+    // cpuset
     /// A comma-separated list of CPU IDs where the task in the control group can run. Dashes
     /// between numbers indicate ranges.
     pub cpus: String,
     /// Same syntax as the `cpus` field of this structure, but applies to memory nodes instead of
     /// processors.
     pub mems: String,
-    /* cpu */
+    // cpu
     /// Weight of how much of the total CPU time should this control group get. Note that this is
     /// hierarchical, so this is weighted against the siblings of this control group.
     pub shares: u64,
@@ -309,13 +347,13 @@ pub struct DeviceResource {
     /// If true, access to the device is allowed, otherwise it's denied.
     pub allow: bool,
     /// `'c'` for character device, `'b'` for block device; or `'a'` for all devices.
-    pub devtype: String,
+    pub devtype: ::devices::DeviceType,
     /// The major number of the device.
-    pub major: u64,
+    pub major: i64,
     /// The minor number of the device.
-    pub minor: u64,
+    pub minor: i64,
     /// Sequence of `'r'`, `'w'` or `'m'`, each denoting read, write or mknod permissions.
-    pub access: String,
+    pub access: Vec<::devices::DevicePermissions>,
 }
 
 /// Limit the usage of devices for the control group's tasks.
@@ -443,23 +481,18 @@ pub struct CgroupPid {
 
 impl From<u64> for CgroupPid {
     fn from(u: u64) -> CgroupPid {
-        CgroupPid {
+        CgroupPid { pid: u }
-            pid: u,
-        }
     }
 }
 
 impl<'a> From<&'a std::process::Child> for CgroupPid {
     fn from(u: &std::process::Child) -> CgroupPid {
-        CgroupPid {
+        CgroupPid { pid: u.id() as u64 }
-            pid: u.id() as u64,
-        }
     }
 }
 
-
 impl Subsystem {
-    fn enter(self: Self, path: &String) -> Self {
+    fn enter(self, path: &Path) -> Self {
         match self {
             Subsystem::Pid(cont) => Subsystem::Pid({
                 let mut c = cont.clone();
@@ -529,7 +562,7 @@ impl Subsystem {
         }
     }
 
-    fn to_controller(self: &Self) -> &dyn Controller {
+    fn to_controller(&self) -> &dyn Controller {
         match self {
             Subsystem::Pid(cont) => cont,
             Subsystem::Mem(cont) => cont,

src/memory.rs

@@ -1,13 +1,17 @@
 //! This module contains the implementation of the `memory` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/memory.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt)
-use std::path::PathBuf;
-use std::io::{Write, Read};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, Resources, MemoryResources, Controller, Controllers, Subsystem, ControllIdentifier};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, MemoryResources, Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `memory` subsystem of a Cgroup.
 ///
@@ -15,11 +19,286 @@ use CgroupError::*;
 /// of the tasks in the control group. Additonally, one can also set powerful limits on their
 /// memory usage.
 #[derive(Debug, Clone)]
-pub struct MemController{
+pub struct MemController {
     base: PathBuf,
     path: PathBuf,
 }
 
+/// Controls statistics and controls about the OOM killer operating in this control group.
+#[derive(Default, Debug, PartialEq, Eq)]
+pub struct OomControl {
+    /// If true, the OOM killer has been disabled for the tasks in this control group.
+    pub oom_kill_disable: bool,
+    /// Is the OOM killer currently running for the tasks in the control group?
+    pub under_oom: bool,
+    /// How many tasks were killed by the OOM killer so far.
+    pub oom_kill: u64,
+}
+
+fn parse_oom_control(s: String) -> Result<OomControl> {
+    let spl = s.split_whitespace().collect::<Vec<_>>();
+
+    Ok(OomControl {
+        oom_kill_disable: spl[1].parse::<u64>().unwrap() == 1,
+        under_oom: spl[3].parse::<u64>().unwrap() == 1,
+        oom_kill: spl[5].parse::<u64>().unwrap(),
+    })
+}
+
+/// Contains statistics about the NUMA locality of the control group's tasks.
+#[derive(Default, Debug, PartialEq, Eq)]
+pub struct NumaStat {
+    /// Total amount of pages used by the control group.
+    pub total_pages: u64,
+    /// Total amount of pages used by the control group, broken down by NUMA node.
+    pub total_pages_per_node: Vec<u64>,
+    /// Total amount of file pages used by the control group.
+    pub file_pages: u64,
+    /// Total amount of file pages used by the control group, broken down by NUMA node.
+    pub file_pages_per_node: Vec<u64>,
+    /// Total amount of anonymous pages used by the control group.
+    pub anon_pages: u64,
+    /// Total amount of anonymous pages used by the control group, broken down by NUMA node.
+    pub anon_pages_per_node: Vec<u64>,
+    /// Total amount of unevictable pages used by the control group.
+    pub unevictable_pages: u64,
+    /// Total amount of unevictable pages used by the control group, broken down by NUMA node.
+    pub unevictable_pages_per_node: Vec<u64>,
+
+    /// Same as `total_pages`, but includes the descedant control groups' number as well.
+    pub hierarchical_total_pages: u64,
+    /// Same as `total_pages_per_node`, but includes the descedant control groups' number as well.
+    pub hierarchical_total_pages_per_node: Vec<u64>,
+    /// Same as `file_pages`, but includes the descedant control groups' number as well.
+    pub hierarchical_file_pages: u64,
+    /// Same as `file_pages_per_node`, but includes the descedant control groups' number as well.
+    pub hierarchical_file_pages_per_node: Vec<u64>,
+    /// Same as `anon_pages`, but includes the descedant control groups' number as well.
+    pub hierarchical_anon_pages: u64,
+    /// Same as `anon_pages_per_node`, but includes the descedant control groups' number as well.
+    pub hierarchical_anon_pages_per_node: Vec<u64>,
+    /// Same as `unevictable`, but includes the descedant control groups' number as well.
+    pub hierarchical_unevictable_pages: u64,
+    /// Same as `unevictable_per_node`, but includes the descedant control groups' number as well.
+    pub hierarchical_unevictable_pages_per_node: Vec<u64>,
+}
+
+fn parse_numa_stat(s: String) -> Result<NumaStat> {
+    // Parse the number of nodes
+    let nodes = (s.split_whitespace().collect::<Vec<_>>().len() - 8) / 8;
+    let mut ls = s.lines();
+    let total_line = ls.next().unwrap();
+    let file_line = ls.next().unwrap();
+    let anon_line = ls.next().unwrap();
+    let unevict_line = ls.next().unwrap();
+    let hier_total_line = ls.next().unwrap();
+    let hier_file_line = ls.next().unwrap();
+    let hier_anon_line = ls.next().unwrap();
+    let hier_unevict_line = ls.next().unwrap();
+
+    Ok(NumaStat {
+        total_pages: total_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        total_pages_per_node: {
+            let spl = &total_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        file_pages: file_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        file_pages_per_node: {
+            let spl = &file_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        anon_pages: anon_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        anon_pages_per_node: {
+            let spl = &anon_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        unevictable_pages: unevict_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        unevictable_pages_per_node: {
+            let spl = &unevict_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        hierarchical_total_pages: hier_total_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        hierarchical_total_pages_per_node: {
+            let spl = &hier_total_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        hierarchical_file_pages: hier_file_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        hierarchical_file_pages_per_node: {
+            let spl = &hier_file_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        hierarchical_anon_pages: hier_anon_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        hierarchical_anon_pages_per_node: {
+            let spl = &hier_anon_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+        hierarchical_unevictable_pages: hier_unevict_line
+            .split(|x| x == ' ' || x == '=')
+            .collect::<Vec<_>>()[1]
+            .parse::<u64>()
+            .unwrap_or(0),
+        hierarchical_unevictable_pages_per_node: {
+            let spl = &hier_unevict_line.split(" ").collect::<Vec<_>>()[1..];
+            spl.iter()
+                .map(|x| {
+                    x.split("=").collect::<Vec<_>>()[1]
+                        .parse::<u64>()
+                        .unwrap_or(0)
+                }).collect()
+        },
+    })
+}
+
+#[derive(Default, Debug, PartialEq, Eq)]
+pub struct MemoryStat {
+    pub cache: u64,
+    pub rss: u64,
+    pub rss_huge: u64,
+    pub shmem: u64,
+    pub mapped_file: u64,
+    pub dirty: u64,
+    pub writeback: u64,
+    pub swap: u64,
+    pub pgpgin: u64,
+    pub pgpgout: u64,
+    pub pgfault: u64,
+    pub pgmajfault: u64,
+    pub inactive_anon: u64,
+    pub active_anon: u64,
+    pub inactive_file: u64,
+    pub active_file: u64,
+    pub unevictable: u64,
+    pub hierarchical_memory_limit: u64,
+    pub hierarchical_memsw_limit: u64,
+    pub total_cache: u64,
+    pub total_rss: u64,
+    pub total_rss_huge: u64,
+    pub total_shmem: u64,
+    pub total_mapped_file: u64,
+    pub total_dirty: u64,
+    pub total_writeback: u64,
+    pub total_swap: u64,
+    pub total_pgpgin: u64,
+    pub total_pgpgout: u64,
+    pub total_pgfault: u64,
+    pub total_pgmajfault: u64,
+    pub total_inactive_anon: u64,
+    pub total_active_anon: u64,
+    pub total_inactive_file: u64,
+    pub total_active_file: u64,
+    pub total_unevictable: u64,
+}
+
+fn parse_memory_stat(s: String) -> Result<MemoryStat> {
+    let sp: Vec<&str> = s
+        .split_whitespace()
+        .filter(|x| x.parse::<u64>().is_ok())
+        .collect();
+
+    let mut spl = sp.iter();
+    Ok(MemoryStat {
+        cache: spl.next().unwrap().parse::<u64>().unwrap(),
+        rss: spl.next().unwrap().parse::<u64>().unwrap(),
+        rss_huge: spl.next().unwrap().parse::<u64>().unwrap(),
+        shmem: spl.next().unwrap().parse::<u64>().unwrap(),
+        mapped_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        dirty: spl.next().unwrap().parse::<u64>().unwrap(),
+        writeback: spl.next().unwrap().parse::<u64>().unwrap(),
+        swap: spl.next().unwrap().parse::<u64>().unwrap(),
+        pgpgin: spl.next().unwrap().parse::<u64>().unwrap(),
+        pgpgout: spl.next().unwrap().parse::<u64>().unwrap(),
+        pgfault: spl.next().unwrap().parse::<u64>().unwrap(),
+        pgmajfault: spl.next().unwrap().parse::<u64>().unwrap(),
+        inactive_anon: spl.next().unwrap().parse::<u64>().unwrap(),
+        active_anon: spl.next().unwrap().parse::<u64>().unwrap(),
+        inactive_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        active_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        unevictable: spl.next().unwrap().parse::<u64>().unwrap(),
+        hierarchical_memory_limit: spl.next().unwrap().parse::<u64>().unwrap(),
+        hierarchical_memsw_limit: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_cache: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_rss: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_rss_huge: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_shmem: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_mapped_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_dirty: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_writeback: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_swap: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_pgpgin: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_pgpgout: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_pgfault: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_pgmajfault: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_inactive_anon: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_active_anon: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_inactive_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_active_file: spl.next().unwrap().parse::<u64>().unwrap(),
+        total_unevictable: spl.next().unwrap().parse::<u64>().unwrap(),
+    })
+}
+
 /// Contains statistics about the current usage of memory and swap (together, not seperately) by
 /// the control group's tasks.
 #[derive(Debug)]
@@ -48,7 +327,6 @@ pub struct Memory {
     pub max_usage_in_bytes: u64,
     /// Whether moving charges at immigrate is allowed.
     pub move_charge_at_immigrate: u64,
-    /* TODO: parse this */
     /// Contains various statistics about the NUMA locality of the control group's tasks.
     ///
     /// The format of this field (as lifted from the kernel sources):
@@ -59,17 +337,15 @@ pub struct Memory {
     /// unevictable=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ...
     /// hierarchical_<counter>=<counter pages> N0=<node 0 pages> N1=<node 1 pages> ...
     /// ```
-    pub numa_stat: String,
+    pub numa_stat: NumaStat,
-    /// If this equals "1", then the OOM killer is enabled for this control group (this is the
+    /// Various statistics and control information about the Out Of Memory killer.
-    /// default setting).
+    pub oom_control: OomControl,
-    pub oom_control: String,
     /// Allows setting a limit to memory usage which is enforced when the system (note, _not_ the
     /// control group) detects memory pressure.
     pub soft_limit_in_bytes: u64,
-    /* TODO: parse this */
     /// Contains a wide array of statistics about the memory usage of the tasks in the control
     /// group.
-    pub stat: String,
+    pub stat: MemoryStat,
     /// Set the tendency of the kernel to swap out parts of the address space consumed by the
     /// control group's tasks.
     ///
@@ -115,14 +391,22 @@ pub struct Kmem {
     pub slabinfo: String,
 }
 
-impl Controller for MemController {
+impl ControllerInternal for MemController {
-    fn control_type(self: &Self) -> Controllers { Controllers::Mem }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::Mem
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let memres: &MemoryResources = &res.memory;
 
         if memres.update_values {
@@ -133,6 +417,8 @@ impl Controller for MemController {
             let _ = self.set_tcp_limit(memres.kernel_tcp_memory_limit);
             let _ = self.set_swappiness(memres.swappiness);
         }
+
+        Ok(())
     }
 }
 
@@ -152,130 +438,224 @@ impl MemController {
     ///
     /// See the individual fields for more explanation, and as always, remember to consult the
     /// kernel Documentation and/or sources.
-    pub fn memory_stat(self: &Self) -> Memory {
+    pub fn memory_stat(&self) -> Memory {
         Memory {
-            fail_cnt: self.open_path("memory.failcnt", false)
+            fail_cnt: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.failcnt", false)
-            limit_in_bytes: self.open_path("memory.limit_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            usage_in_bytes: self.open_path("memory.usage_in_bytes", false)
+            limit_in_bytes: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.limit_in_bytes", false)
-            max_usage_in_bytes: self.open_path("memory.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            move_charge_at_immigrate: self.open_path("memory.move_charge_at_immigrate", false)
+            usage_in_bytes: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.usage_in_bytes", false)
-            numa_stat: self.open_path("memory.numa_stat", false)
+                .and_then(read_u64_from)
-                            .and_then(read_string_from).unwrap_or("".to_string()),
+                .unwrap_or(0),
-            oom_control: self.open_path("memory.oom_control", false)
+            max_usage_in_bytes: self
-                            .and_then(read_string_from).unwrap_or("".to_string()),
+                .open_path("memory.max_usage_in_bytes", false)
-            soft_limit_in_bytes: self.open_path("memory.soft_limit_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from)
+                .unwrap_or(0),
-                            .unwrap_or(0),
+            move_charge_at_immigrate: self
-            stat: self.open_path("memory.stat", false)
+                .open_path("memory.move_charge_at_immigrate", false)
-                            .and_then(read_string_from).unwrap_or("".to_string()),
+                .and_then(read_u64_from)
-            swappiness: self.open_path("memory.swappiness", false)
+                .unwrap_or(0),
-                            .and_then(read_u64_from)
+            numa_stat: self
-                            .unwrap_or(0),
+                .open_path("memory.numa_stat", false)
-            use_hierarchy: self.open_path("memory.use_hierarchy", false)
+                .and_then(read_string_from)
-                            .and_then(read_u64_from)
+                .and_then(parse_numa_stat)
-                            .unwrap_or(0)
+                .unwrap_or(NumaStat::default()),
+            oom_control: self
+                .open_path("memory.oom_control", false)
+                .and_then(read_string_from)
+                .and_then(parse_oom_control)
+                .unwrap_or(OomControl::default()),
+            soft_limit_in_bytes: self
+                .open_path("memory.soft_limit_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            stat: self
+                .open_path("memory.stat", false)
+                .and_then(read_string_from)
+                .and_then(parse_memory_stat)
+                .unwrap_or(MemoryStat::default()),
+            swappiness: self
+                .open_path("memory.swappiness", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            use_hierarchy: self
+                .open_path("memory.use_hierarchy", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
         }
     }
 
     /// Gathers information about the kernel memory usage of the control group's tasks.
-    pub fn kmem_stat(self: &Self) -> Kmem {
+    pub fn kmem_stat(&self) -> Kmem {
         Kmem {
-            fail_cnt: self.open_path("memory.kmem.failcnt", false)
+            fail_cnt: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.kmem.failcnt", false)
-            limit_in_bytes: self.open_path("memory.kmem.limit_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            usage_in_bytes: self.open_path("memory.kmem.usage_in_bytes", false)
+            limit_in_bytes: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.kmem.limit_in_bytes", false)
-            max_usage_in_bytes: self.open_path("memory.kmem.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            slabinfo: self.open_path("memory.kmem.slabinfo", false)
+            usage_in_bytes: self
-                            .and_then(read_string_from).unwrap_or("".to_string()),
+                .open_path("memory.kmem.usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            max_usage_in_bytes: self
+                .open_path("memory.kmem.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            slabinfo: self
+                .open_path("memory.kmem.slabinfo", false)
+                .and_then(read_string_from)
+                .unwrap_or("".to_string()),
         }
     }
 
     /// Gathers information about the control group's kernel memory usage where said memory is
     /// TCP-related.
-    pub fn kmem_tcp_stat(self: &Self) -> Tcp {
+    pub fn kmem_tcp_stat(&self) -> Tcp {
         Tcp {
-            fail_cnt: self.open_path("memory.kmem.tcp.failcnt", false)
+            fail_cnt: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.kmem.tcp.failcnt", false)
-            limit_in_bytes: self.open_path("memory.kmem.tcp.limit_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            usage_in_bytes: self.open_path("memory.kmem.tcp.usage_in_bytes", false)
+            limit_in_bytes: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.kmem.tcp.limit_in_bytes", false)
-            max_usage_in_bytes: self.open_path("memory.kmem.tcp.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
+            usage_in_bytes: self
+                .open_path("memory.kmem.tcp.usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            max_usage_in_bytes: self
+                .open_path("memory.kmem.tcp.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
         }
     }
 
     /// Gathers information about the memory usage of the control group including the swap usage
     /// (if any).
-    pub fn memswap(self: &Self) -> MemSwap {
+    pub fn memswap(&self) -> MemSwap {
         MemSwap {
-            fail_cnt: self.open_path("memory.memsw.failcnt", false)
+            fail_cnt: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.memsw.failcnt", false)
-            limit_in_bytes: self.open_path("memory.memsw.limit_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
-            usage_in_bytes: self.open_path("memory.memsw.usage_in_bytes", false)
+            limit_in_bytes: self
-                            .and_then(read_u64_from).unwrap_or(0),
+                .open_path("memory.memsw.limit_in_bytes", false)
-            max_usage_in_bytes: self.open_path("memory.memsw.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
-                            .and_then(read_u64_from).unwrap_or(0),
+                .unwrap_or(0),
+            usage_in_bytes: self
+                .open_path("memory.memsw.usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
+            max_usage_in_bytes: self
+                .open_path("memory.memsw.max_usage_in_bytes", false)
+                .and_then(read_u64_from)
+                .unwrap_or(0),
         }
     }
 
+    /// Reset the fail counter
+    pub fn reset_fail_count(&self) -> Result<()> {
+        self.open_path("memory.failcnt", true)
+            .and_then(|mut file| {
+                file.write_all("0".to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
+    /// Reset the kernel memory fail counter
+    pub fn reset_kmem_fail_count(&self) -> Result<()> {
+        self.open_path("memory.kmem.failcnt", true)
+            .and_then(|mut file| {
+                file.write_all("0".to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
+    /// Reset the TCP related fail counter
+    pub fn reset_tcp_fail_count(&self) -> Result<()> {
+        self.open_path("memory.kmem.tcp.failcnt", true)
+            .and_then(|mut file| {
+                file.write_all("0".to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
+    /// Reset the memory+swap fail counter
+    pub fn reset_memswap_fail_count(&self) -> Result<()> {
+        self.open_path("memory.memsw.failcnt", true)
+            .and_then(|mut file| {
+                file.write_all("0".to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
+    }
+
     /// Set the memory usage limit of the control group, in bytes.
-    pub fn set_limit(self: &Self, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_limit(&self, limit: u64) -> Result<()> {
-        self.open_path("memory.limit_in_bytes", true).and_then(|mut file| {
+        self.open_path("memory.limit_in_bytes", true)
-            file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Set the kernel memory limit of the control group, in bytes.
-    pub fn set_kmem_limit(self: &Self, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_kmem_limit(&self, limit: u64) -> Result<()> {
-        self.open_path("memory.kmem.limit_in_bytes", true).and_then(|mut file| {
+        self.open_path("memory.kmem.limit_in_bytes", true)
-            file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Set the memory+swap limit of the control group, in bytes.
-    pub fn set_memswap_limit(self: &Self, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_memswap_limit(&self, limit: u64) -> Result<()> {
-        self.open_path("memory.memsw.limit_in_bytes", true).and_then(|mut file| {
+        self.open_path("memory.memsw.limit_in_bytes", true)
-            file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Set how much kernel memory can be used for TCP-related buffers by the control group.
-    pub fn set_tcp_limit(self: &Self, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_tcp_limit(&self, limit: u64) -> Result<()> {
-        self.open_path("memory.kmem.tcp.limit_in_bytes", true).and_then(|mut file| {
+        self.open_path("memory.kmem.tcp.limit_in_bytes", true)
-            file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
-
     /// Set the soft limit of the control group, in bytes.
     ///
     /// This limit is enforced when the system is nearing OOM conditions. Contrast this with the
     /// hard limit, which is _always_ enforced.
-    pub fn set_soft_limit(self: &Self, limit: u64) -> Result<(), CgroupError> {
+    pub fn set_soft_limit(&self, limit: u64) -> Result<()> {
-        self.open_path("memory.soft_limit_in_bytes", true).and_then(|mut file| {
+        self.open_path("memory.soft_limit_in_bytes", true)
-            file.write_all(limit.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(limit.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
-
     /// Set how likely the kernel is to swap out parts of the address space used by the control
     /// group.
     ///
     /// Note that a value of zero does not imply that the process will not be swapped out.
-    pub fn set_swappiness(self: &Self, swp: u64) -> Result<(), CgroupError> {
+    pub fn set_swappiness(&self, swp: u64) -> Result<()> {
-        self.open_path("memory.swappiness", true).and_then(|mut file| {
+        self.open_path("memory.swappiness", true)
-            file.write_all(swp.to_string().as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(swp.to_string().as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 }
 
@@ -293,24 +673,173 @@ impl<'a> From<&'a Subsystem> for &'a MemController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
-fn read_string_from(mut file: File) -> Result<String, CgroupError> {
+fn read_string_from(mut file: File) -> Result<String> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
         Ok(_) => Ok(string.trim().to_string()),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use memory::{
+        parse_memory_stat, parse_numa_stat, parse_oom_control, MemoryStat, NumaStat, OomControl,
+    };
+
+    static GOOD_VALUE: &str = "\
+total=51189 N0=51189 N1=123
+file=50175 N0=50175 N1=123
+anon=1014 N0=1014 N1=123
+unevictable=0 N0=0 N1=123
+hierarchical_total=1628573 N0=1628573 N1=123
+hierarchical_file=858151 N0=858151 N1=123
+hierarchical_anon=770402 N0=770402 N1=123
+hierarchical_unevictable=20 N0=20 N1=123
+";
+
+    static GOOD_OOMCONTROL_VAL: &str = "\
+oom_kill_disable 0
+under_oom 1
+oom_kill 1337
+";
+
+    static GOOD_MEMORYSTAT_VAL: &str = "\
+cache 178880512
+rss 4206592
+rss_huge 0
+shmem 106496
+mapped_file 7491584
+dirty 114688
+writeback 49152
+swap 0
+pgpgin 213928
+pgpgout 169220
+pgfault 87064
+pgmajfault 202
+inactive_anon 0
+active_anon 4153344
+inactive_file 84779008
+active_file 94273536
+unevictable 0
+hierarchical_memory_limit 9223372036854771712
+hierarchical_memsw_limit 9223372036854771712
+total_cache 4200333312
+total_rss 2927677440
+total_rss_huge 0
+total_shmem 590061568
+total_mapped_file 1086164992
+total_dirty 1769472
+total_writeback 602112
+total_swap 0
+total_pgpgin 5267326291
+total_pgpgout 5265586647
+total_pgfault 9947902469
+total_pgmajfault 25132
+total_inactive_anon 585981952
+total_active_anon 2928996352
+total_inactive_file 1272135680
+total_active_file 2338816000
+total_unevictable 81920
+";
+
+    #[test]
+    fn test_parse_numa_stat() {
+        let ok = parse_numa_stat(GOOD_VALUE.to_string()).unwrap();
+        assert_eq!(
+            ok,
+            NumaStat {
+                total_pages: 51189,
+                total_pages_per_node: vec![51189, 123],
+                file_pages: 50175,
+                file_pages_per_node: vec![50175, 123],
+                anon_pages: 1014,
+                anon_pages_per_node: vec![1014, 123],
+                unevictable_pages: 0,
+                unevictable_pages_per_node: vec![0, 123],
+
+                hierarchical_total_pages: 1628573,
+                hierarchical_total_pages_per_node: vec![1628573, 123],
+                hierarchical_file_pages: 858151,
+                hierarchical_file_pages_per_node: vec![858151, 123],
+                hierarchical_anon_pages: 770402,
+                hierarchical_anon_pages_per_node: vec![770402, 123],
+                hierarchical_unevictable_pages: 20,
+                hierarchical_unevictable_pages_per_node: vec![20, 123],
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_oom_control() {
+        let ok = parse_oom_control(GOOD_OOMCONTROL_VAL.to_string()).unwrap();
+        assert_eq!(
+            ok,
+            OomControl {
+                oom_kill_disable: false,
+                under_oom: true,
+                oom_kill: 1337,
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_memory_stat() {
+        let ok = parse_memory_stat(GOOD_MEMORYSTAT_VAL.to_string()).unwrap();
+        assert_eq!(
+            ok,
+            MemoryStat {
+                cache: 178880512,
+                rss: 4206592,
+                rss_huge: 0,
+                shmem: 106496,
+                mapped_file: 7491584,
+                dirty: 114688,
+                writeback: 49152,
+                swap: 0,
+                pgpgin: 213928,
+                pgpgout: 169220,
+                pgfault: 87064,
+                pgmajfault: 202,
+                inactive_anon: 0,
+                active_anon: 4153344,
+                inactive_file: 84779008,
+                active_file: 94273536,
+                unevictable: 0,
+                hierarchical_memory_limit: 9223372036854771712,
+                hierarchical_memsw_limit: 9223372036854771712,
+                total_cache: 4200333312,
+                total_rss: 2927677440,
+                total_rss_huge: 0,
+                total_shmem: 590061568,
+                total_mapped_file: 1086164992,
+                total_dirty: 1769472,
+                total_writeback: 602112,
+                total_swap: 0,
+                total_pgpgin: 5267326291,
+                total_pgpgout: 5265586647,
+                total_pgfault: 9947902469,
+                total_pgmajfault: 25132,
+                total_inactive_anon: 585981952,
+                total_active_anon: 2928996352,
+                total_inactive_file: 1272135680,
+                total_active_file: 2338816000,
+                total_unevictable: 81920,
+            }
+        );
     }
 }

src/net_cls.rs

@@ -1,13 +1,18 @@
 //! This module contains the implementation of the `net_cls` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/net_cls.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/net_cls.txt)
-use std::path::PathBuf;
-use std::io::{Read, Write};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, NetworkResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, NetworkResources, Resources,
+    Subsystem,
+};
 
 /// A controller that allows controlling the `net_cls` subsystem of a Cgroup.
 ///
@@ -20,19 +25,31 @@ pub struct NetClsController {
     path: PathBuf,
 }
 
-impl Controller for NetClsController {
+impl ControllerInternal for NetClsController {
-    fn control_type(self: &Self) -> Controllers { Controllers::NetCls }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::NetCls
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let res: &NetworkResources = &res.network;
 
         if res.update_values {
             let _ = self.set_class(res.class_id);
+            if self.get_class()? != res.class_id {
+                return Err(Error::new(Other));
+            }
         }
+        return Ok(());
     }
 }
 
@@ -50,17 +67,17 @@ impl<'a> From<&'a Subsystem> for &'a NetClsController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -74,19 +91,19 @@ impl NetClsController {
             path: root,
         }
     }
-    
+
     /// Set the network class id of the outgoing packets of the control group's tasks.
-    pub fn set_class(self: &Self, class: u64) -> Result<(), CgroupError> {
+    pub fn set_class(&self, class: u64) -> Result<()> {
-        self.open_path("net_cls.classid", true).and_then(|mut file| {
+        self.open_path("net_cls.classid", true)
-            let s = format!("{:#08X}", class);
+            .and_then(|mut file| {
-            file.write_all(s.as_ref()).map_err(CgroupError::WriteError)
+                let s = format!("{:#08X}", class);
-        })
+                file.write_all(s.as_ref()).map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 
     /// Get the network class id of the outgoing packets of the control group's tasks.
-    pub fn get_class(self: &Self) -> Result<u64, CgroupError> {
+    pub fn get_class(&self) -> Result<u64> {
-        self.open_path("net_cls.classid", false).and_then(|file| {
+        self.open_path("net_cls.classid", false)
-            read_u64_from(file)
+            .and_then(|file| read_u64_from(file))
-        })
     }
 }

src/net_prio.rs

@@ -1,14 +1,19 @@
 //! This module contains the implementation of the `net_prio` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/net_prio.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/net_prio.txt)
-use std::path::PathBuf;
-use std::io::{BufReader, BufRead, Write, Read};
-use std::fs::File;
 use std::collections::HashMap;
+use std::fs::File;
+use std::io::{BufRead, BufReader, Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, NetworkResources, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, NetworkResources, Resources,
+    Subsystem,
+};
 
 /// A controller that allows controlling the `net_prio` subsystem of a Cgroup.
 ///
@@ -21,14 +26,22 @@ pub struct NetPrioController {
     path: PathBuf,
 }
 
-impl Controller for NetPrioController {
+impl ControllerInternal for NetPrioController {
-    fn control_type(self: &Self) -> Controllers { Controllers::NetPrio }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::NetPrio
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let res: &NetworkResources = &res.network;
 
         if res.update_values {
@@ -36,6 +49,8 @@ impl Controller for NetPrioController {
                 let _ = self.set_if_prio(&i.name, i.priority);
             }
         }
+
+        Ok(())
     }
 }
 
@@ -53,17 +68,17 @@ impl<'a> From<&'a Subsystem> for &'a NetPrioController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -79,46 +94,50 @@ impl NetPrioController {
     }
 
     /// Retrieves the current priority of the emitted packets.
-    pub fn prio_idx(self: &Self) -> u64 {
+    pub fn prio_idx(&self) -> u64 {
         self.open_path("net_prio.prioidx", false)
             .and_then(read_u64_from)
             .unwrap_or(0)
     }
 
     /// A map of priorities for each network interface.
-    pub fn ifpriomap(self: &Self) -> Result<HashMap<String, u64>, CgroupError> {
+    pub fn ifpriomap(&self) -> Result<HashMap<String, u64>> {
-        self.open_path("net_prio.ifpriomap", false) .and_then(|file| {
+        self.open_path("net_prio.ifpriomap", false)
-            let bf = BufReader::new(file);
+            .and_then(|file| {
-            bf.lines().fold(Ok(HashMap::new()), |acc, line| {
+                let bf = BufReader::new(file);
-                if acc.is_err() {
+                bf.lines().fold(Ok(HashMap::new()), |acc, line| {
-                    acc
+                    if acc.is_err() {
-                } else {
+                        acc
-                    let mut acc = acc.unwrap();
-                    let l = line.unwrap();
-                    let mut sp = l.split_whitespace();
-                    let ifname = sp.nth(0);
-                    let ifprio = sp.nth(1);
-                    if ifname.is_none() || ifprio.is_none() {
-                        Err(CgroupError::ParseError)
                     } else {
-                        let ifname = ifname.unwrap();
+                        let mut acc = acc.unwrap();
-                        let ifprio = ifprio.unwrap().trim().parse();
+                        let l = line.unwrap();
-                        if ifprio.is_err() {
+                        let mut sp = l.split_whitespace();
-                            Err(CgroupError::ParseError)
+                        let ifname = sp.nth(0);
+                        let ifprio = sp.nth(1);
+                        if ifname.is_none() || ifprio.is_none() {
+                            Err(Error::new(ParseError))
                         } else {
-                            acc.insert(ifname.to_string(), ifprio.unwrap());
+                            let ifname = ifname.unwrap();
-                            Ok(acc)
+                            let ifprio = ifprio.unwrap().trim().parse();
+                            match ifprio {
+                                Err(e) => Err(Error::with_cause(ParseError, e)),
+                                Ok(_) => {
+                                    acc.insert(ifname.to_string(), ifprio.unwrap());
+                                    Ok(acc)
+                                }
+                            }
                         }
                     }
-                }
+                })
             })
-        })
     }
 
     /// Set the priority of the network traffic on `eif` to be `prio`.
-    pub fn set_if_prio(self: &Self, eif: &String, prio: u64) -> Result<(), CgroupError> {
+    pub fn set_if_prio(&self, eif: &str, prio: u64) -> Result<()> {
-        self.open_path("net_prio.ifpriomap", true).and_then(|mut file| {
+        self.open_path("net_prio.ifpriomap", true)
-            file.write_all(format!("{} {}", eif, prio).as_ref()).map_err(CgroupError::WriteError)
+            .and_then(|mut file| {
-        })
+                file.write_all(format!("{} {}", eif, prio).as_ref())
+                    .map_err(|e| Error::with_cause(WriteFailed, e))
+            })
     }
 }

src/perf_event.rs

@@ -1,10 +1,12 @@
 //! This module contains the implementation of the `perf_event` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [tools/perf/Documentation/perf-record.txt](https://raw.githubusercontent.com/torvalds/linux/master/tools/perf/Documentation/perf-record.txt)
 use std::path::PathBuf;
 
-use {Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
+
+use {ControllIdentifier, ControllerInternal, Controllers, Resources, Subsystem};
 
 /// A controller that allows controlling the `perf_event` subsystem of a Cgroup.
 ///
@@ -16,13 +18,22 @@ pub struct PerfEventController {
     path: PathBuf,
 }
 
-impl Controller for PerfEventController {
+impl ControllerInternal for PerfEventController {
-    fn control_type(self: &Self) -> Controllers { Controllers::PerfEvent }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::PerfEvent
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, _res: &Resources) {
+    fn apply(&self, _res: &Resources) -> Result<()> {
+        Ok(())
     }
 }
 
@@ -40,7 +51,7 @@ impl<'a> From<&'a Subsystem> for &'a PerfEventController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }

src/pid.rs

@@ -1,13 +1,17 @@
 //! This module contains the implementation of the `pids` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroups-v1/pids.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/pids.txt)
-use std::path::PathBuf;
-use std::io::{Write, Read};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, Resources, PidResources, Controller, ControllIdentifier, Subsystem, Controllers};
+use error::*;
-use CgroupError::*;
+use error::ErrorKind::*;
+
+use {
+    ControllIdentifier, ControllerInternal, Controllers, PidResources, Resources, Subsystem,
+};
 
 /// A controller that allows controlling the `pids` subsystem of a Cgroup.
 #[derive(Debug, Clone)]
@@ -32,28 +36,45 @@ impl Default for PidMax {
     }
 }
 
-impl Controller for PidController {
+impl ControllerInternal for PidController {
-    fn control_type(self: &Self) -> Controllers { Controllers::Pids }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::Pids
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, res: &Resources) {
+    fn apply(&self, res: &Resources) -> Result<()> {
-        /* get the resources that apply to this controller */
+        // get the resources that apply to this controller
         let pidres: &PidResources = &res.pid;
 
         if pidres.update_values {
-            /* apply pid_max */
+            // apply pid_max
             let _ = self.set_pid_max(pidres.maximum_number_of_processes);
+
+            // now, verify
+            if self.get_pid_max()? == pidres.maximum_number_of_processes {
+                return Ok(());
+            } else {
+                return Err(Error::new(Other));
+            }
         }
+
+        Ok(())
     }
 }
 
-/*impl<'a> ControllIdentifier for &'a PidController {
+// impl<'a> ControllIdentifier for &'a PidController {
-    fn controller_type() -> Controllers {
+//     fn controller_type() -> Controllers {
-        Controllers::Pids
+//         Controllers::Pids
-    }
+//     }
-}*/
+// }
 
 impl ControllIdentifier for PidController {
     fn controller_type() -> Controllers {
@@ -69,17 +90,17 @@ impl<'a> From<&'a Subsystem> for &'a PidController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_u64_from(mut file: File) -> Result<u64, CgroupError> {
+fn read_u64_from(mut file: File) -> Result<u64> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
-        Ok(_) => string.trim().parse().map_err(|_| ParseError),
+        Ok(_) => string.trim().parse().map_err(|e| Error::with_cause(ParseError, e)),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -96,31 +117,30 @@ impl PidController {
     }
 
     /// The number of times `fork` failed because the limit was hit.
-    pub fn get_pid_events(self: &Self) -> Result<u64, CgroupError> {
+    pub fn get_pid_events(&self) -> Result<u64> {
         self.open_path("pids.events", false).and_then(|mut file| {
             let mut string = String::new();
             match file.read_to_string(&mut string) {
-                Ok(_) => {
+                Ok(_) => match string.split_whitespace().nth(1) {
-                    match string.split_whitespace().nth(1) {
+                    Some(elem) => match elem.parse() {
-                        Some(elem) => match elem.parse() {
+                        Ok(val) => Ok(val),
-                            Ok(val) => Ok(val),
+                        Err(e) => Err(Error::with_cause(ParseError, e)),
-                            Err(_) => Err(CgroupError::ParseError),
+                    },
-                        },
+                    None => Err(Error::new(ParseError)),
-                        None => Err(CgroupError::ParseError),
-                    }
                 },
-                Err(e) => Err(CgroupError::ReadError(e)),
+                Err(e) => Err(Error::with_cause(ReadFailed, e)),
             }
         })
     }
 
     /// The number of processes currently.
-    pub fn get_pid_current(self: &Self) -> Result<u64, CgroupError> {
+    pub fn get_pid_current(&self) -> Result<u64> {
-        self.open_path("pids.current", false).and_then(read_u64_from)
+        self.open_path("pids.current", false)
+            .and_then(read_u64_from)
     }
 
     /// The maximum number of processes that can exist at one time in the control group.
-    pub fn get_pid_max(self: &Self) -> Result<PidMax, CgroupError> {
+    pub fn get_pid_max(&self) -> Result<PidMax> {
         self.open_path("pids.max", false).and_then(|mut file| {
             let mut string = String::new();
             let res = file.read_to_string(&mut string);
@@ -130,10 +150,10 @@ impl PidController {
                 } else {
                     match string.trim().parse() {
                         Ok(val) => Ok(PidMax::Value(val)),
-                        Err(_) => Err(CgroupError::ParseError),
+                        Err(e) => Err(Error::with_cause(ParseError, e)),
                     }
                 },
-                Err(e) => Err(CgroupError::ReadError(e)),
+                Err(e) => Err(Error::with_cause(ReadFailed, e)),
             }
         })
     }
@@ -143,7 +163,7 @@ impl PidController {
     /// Note that if `get_pid_current()` returns a higher number than what you
     /// are about to set (`max_pid`), then no processess will be killed. Additonally, attaching
     /// extra processes to a control group disregards the limit.
-    pub fn set_pid_max(self: &Self, max_pid: PidMax) -> Result<(), CgroupError> {
+    pub fn set_pid_max(&self, max_pid: PidMax) -> Result<()> {
         self.open_path("pids.max", true).and_then(|mut file| {
             let string_to_write = match max_pid {
                 PidMax::Max => "max".to_string(),
@@ -151,7 +171,7 @@ impl PidController {
             };
             match file.write_all(string_to_write.as_ref()) {
                 Ok(_) => Ok(()),
-                Err(e) => Err(CgroupError::WriteError(e)),
+                Err(e) => Err(Error::with_cause(WriteFailed, e)),
             }
         })
     }

src/rdma.rs

@@ -1,12 +1,15 @@
 //! This module contains the implementation of the `rdma` cgroup subsystem.
-//! 
+//!
 //! See the Kernel's documentation for more information about this subsystem, found at:
 //!  [Documentation/cgroup-v1/rdma.txt](https://www.kernel.org/doc/Documentation/cgroup-v1/rdma.txt)
-use std::path::PathBuf;
-use std::io::{Write, Read};
 use std::fs::File;
+use std::io::{Read, Write};
+use std::path::PathBuf;
 
-use {CgroupError, Controllers, Controller, Resources, ControllIdentifier, Subsystem};
+use error::*;
+use error::ErrorKind::*;
+
+use {ControllIdentifier, ControllerInternal, Controllers, Resources, Subsystem};
 
 /// A controller that allows controlling the `rdma` subsystem of a Cgroup.
 ///
@@ -18,13 +21,22 @@ pub struct RdmaController {
     path: PathBuf,
 }
 
-impl Controller for RdmaController {
+impl ControllerInternal for RdmaController {
-    fn control_type(self: &Self) -> Controllers { Controllers::Rdma }
+    fn control_type(&self) -> Controllers {
-    fn get_path<'a>(self: &'a Self) -> &'a PathBuf { &self.path }
+        Controllers::Rdma
-    fn get_path_mut<'a>(self: &'a mut Self) -> &'a mut PathBuf { &mut self.path }
+    }
-    fn get_base<'a>(self: &'a Self) -> &'a PathBuf { &self.base }
+    fn get_path(&self) -> &PathBuf {
+        &self.path
+    }
+    fn get_path_mut(&mut self) -> &mut PathBuf {
+        &mut self.path
+    }
+    fn get_base(&self) -> &PathBuf {
+        &self.base
+    }
 
-    fn apply(self: &Self, _res: &Resources) {
+    fn apply(&self, _res: &Resources) -> Result<()> {
+        Ok(())
     }
 }
 
@@ -42,17 +54,17 @@ impl<'a> From<&'a Subsystem> for &'a RdmaController {
                 _ => {
                     assert_eq!(1, 0);
                     ::std::mem::uninitialized()
-                },
+                }
             }
         }
     }
 }
 
-fn read_string_from(mut file: File) -> Result<String, CgroupError> {
+fn read_string_from(mut file: File) -> Result<String> {
     let mut string = String::new();
     match file.read_to_string(&mut string) {
         Ok(_) => Ok(string.trim().to_string()),
-        Err(e) => Err(CgroupError::ReadError(e)),
+        Err(e) => Err(Error::with_cause(ReadFailed, e)),
     }
 }
 
@@ -68,15 +80,16 @@ impl RdmaController {
     }
 
     /// Returns the current usage of RDMA/IB specific resources.
-    pub fn current(self: &Self) -> Result<String, CgroupError> {
+    pub fn current(&self) -> Result<String> {
         self.open_path("rdma.current", false)
             .and_then(read_string_from)
     }
 
     /// Set a maximum usage for each RDMA/IB resource.
-    pub fn set_max(self: &Self, max: &String) -> Result<(), CgroupError> {
+    pub fn set_max(&self, max: &str) -> Result<()> {
         self.open_path("rdma.max", true).and_then(|mut file| {
-            file.write_all(max.as_ref()).map_err(CgroupError::WriteError)
+            file.write_all(max.as_ref())
+                .map_err(|e| Error::with_cause(WriteFailed, e))
         })
     }
 }

tests/builder.rs

@@ -0,0 +1,145 @@
+//! Some simple tests covering the builder pattern for control groups.
+extern crate cgroups;
+use cgroups::*;
+use cgroups::cpu::*;
+use cgroups::devices::*;
+use cgroups::pid::*;
+use cgroups::memory::*;
+use cgroups::net_cls::*;
+use cgroups::hugetlb::*;
+use cgroups::blkio::*;
+use cgroups::cgroup_builder::*;
+
+#[test]
+pub fn test_cpu_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_cpu_res_build", &v1)
+        .cpu()
+            .shares(85)
+            .done()
+        .build();
+
+    {
+        let cpu: &CpuController = cg.controller_of().unwrap();
+        assert!(cpu.shares().is_ok());
+        assert_eq!(cpu.shares().unwrap(), 85);
+    }
+
+    cg.delete();
+}
+
+#[test]
+pub fn test_memory_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_memory_res_build", &v1)
+        .memory()
+            .kernel_memory_limit(128 * 1024 * 1024)
+            .swappiness(70)
+            .memory_hard_limit(1024 * 1024 * 1024)
+            .done()
+        .build();
+
+    {
+        let c: &MemController = cg.controller_of().unwrap();
+        assert_eq!(c.kmem_stat().limit_in_bytes, 128 * 1024 * 1024);
+        assert_eq!(c.memory_stat().swappiness, 70);
+        assert_eq!(c.memory_stat().limit_in_bytes, 1024 * 1024 * 1024);
+    }
+
+    cg.delete();
+}
+
+#[test]
+pub fn test_pid_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_pid_res_build", &v1)
+        .pid()
+            .maximum_number_of_processes(PidMax::Value(123))
+            .done()
+        .build();
+
+    {
+        let c: &PidController = cg.controller_of().unwrap();
+        assert!(c.get_pid_max().is_ok());
+        assert_eq!(c.get_pid_max().unwrap(), PidMax::Value(123));
+    }
+
+    cg.delete();
+}
+
+#[test]
+#[ignore] // ignore this test for now, not sure why my kernel doesn't like it
+pub fn test_devices_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_devices_res_build", &v1)
+        .devices()
+            .device(1, 6, DeviceType::Char, true,
+                    vec![DevicePermissions::Read])
+            .done()
+        .build();
+
+    {
+        let c: &DevicesController = cg.controller_of().unwrap();
+        assert!(c.allowed_devices().is_ok());
+        assert_eq!(c.allowed_devices().unwrap(), vec![
+                   DeviceResource {
+                       allow: true,
+                       devtype: DeviceType::Char,
+                       major: 1,
+                       minor: 6,
+                       access: vec![DevicePermissions::Read],
+                   }
+        ]);
+    }
+    cg.delete();
+}
+
+#[test]
+pub fn test_network_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_network_res_build", &v1)
+        .network()
+            .class_id(1337)
+            .done()
+        .build();
+
+    {
+        let c: &NetClsController = cg.controller_of().unwrap();
+        assert!(c.get_class().is_ok());
+        assert_eq!(c.get_class().unwrap(), 1337);
+    }
+    cg.delete();
+}
+
+#[test]
+pub fn test_hugepages_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_hugepages_res_build", &v1)
+        .hugepages()
+            .limit("2MB".to_string(), 4 * 2 * 1024 * 1024)
+            .done()
+        .build();
+
+    {
+        let c: &HugeTlbController = cg.controller_of().unwrap();
+        assert!(c.limit_in_bytes(&"2MB".to_string()).is_ok());
+        assert_eq!(c.limit_in_bytes(&"2MB".to_string()).unwrap(), 4 * 2 * 1024 * 1024);
+    }
+    cg.delete();
+}
+
+#[test]
+pub fn test_blkio_res_build() {
+    let v1 = ::hierarchies::V1::new();
+    let cg: Cgroup = CgroupBuilder::new("test_blkio_res_build", &v1)
+        .blkio()
+            .weight(100)
+            .done()
+        .build();
+
+    {
+        let c: &BlkIoController = cg.controller_of().unwrap();
+        assert_eq!(c.blkio().weight, 100);
+    }
+    cg.delete();
+}

tests/cgroup.rs

@@ -2,8 +2,8 @@
 extern crate cgroups;
 use cgroups::{Cgroup, CgroupPid};
 
-extern crate nix;
 extern crate libc;
+extern crate nix;
 
 #[test]
 fn test_tasks_iterator() {
@@ -17,7 +17,7 @@ fn test_tasks_iterator() {
         // Verify that the task is indeed in the control group
         assert_eq!(tasks.next(), Some(CgroupPid::from(pid)));
         assert_eq!(tasks.next(), None);
-        
+
         // Now, try removing it.
         cg.remove_task(CgroupPid::from(pid));
         tasks = cg.tasks().into_iter();

tests/cpuset.rs

@@ -0,0 +1,19 @@
+extern crate cgroups;
+
+use cgroups::cpuset::CpuSetController;
+use cgroups::error::ErrorKind;
+use cgroups::Cgroup;
+
+#[test]
+fn test_cpuset_memory_pressure_root_cg() {
+    let hier = cgroups::hierarchies::V1::new();
+    let cg = Cgroup::new(&hier, String::from("test_cpuset_memory_pressure_root_cg"));
+    {
+        let cpuset: &CpuSetController = cg.controller_of().unwrap();
+
+        // This is not a root control group, so it should fail via InvalidOperation.
+        let res = cpuset.set_enable_memory_pressure(true);
+        assert_eq!(res.unwrap_err().kind(), &ErrorKind::InvalidOperation);
+    }
+    cg.delete();
+}

tests/devices.rs

@@ -0,0 +1,57 @@
+//! Integration tests about the devices subsystem
+
+extern crate cgroups;
+use cgroups::devices::{DevicePermissions, DeviceType, DevicesController};
+use cgroups::{Cgroup, DeviceResource};
+
+#[test]
+fn test_devices_parsing() {
+    let hier = cgroups::hierarchies::V1::new();
+    let cg = Cgroup::new(&hier, String::from("test_devices_parsing"));
+    {
+        let devices: &DevicesController = cg.controller_of().unwrap();
+
+        // Deny access to all devices first
+        devices.deny_device(
+            DeviceType::All,
+            -1,
+            -1,
+            &vec![
+                DevicePermissions::Read,
+                DevicePermissions::Write,
+                DevicePermissions::MkNod,
+            ],
+        );
+        // Acquire the list of allowed devices after we denied all
+        let allowed_devices = devices.allowed_devices();
+        // Verify that there are no devices that we can access.
+        assert!(allowed_devices.is_ok());
+        assert_eq!(allowed_devices.unwrap(), Vec::new());
+
+        // Now add mknod access to /dev/null device
+        devices.allow_device(DeviceType::Char, 1, 3, &vec![DevicePermissions::MkNod]);
+        let allowed_devices = devices.allowed_devices();
+        assert!(allowed_devices.is_ok());
+        let allowed_devices = allowed_devices.unwrap();
+        assert_eq!(allowed_devices.len(), 1);
+        assert_eq!(
+            allowed_devices[0],
+            DeviceResource {
+                allow: true,
+                devtype: DeviceType::Char,
+                major: 1,
+                minor: 3,
+                access: vec![DevicePermissions::MkNod],
+            }
+        );
+
+        // Now deny, this device explicitly.
+        devices.deny_device(DeviceType::Char, 1, 3, &DevicePermissions::all());
+        // Finally, check that.
+        let allowed_devices = devices.allowed_devices();
+        // Verify that there are no devices that we can access.
+        assert!(allowed_devices.is_ok());
+        assert_eq!(allowed_devices.unwrap(), Vec::new());
+    }
+    cg.delete();
+}

tests/pids.rs

@@ -1,12 +1,12 @@
 //! Integration tests about the pids subsystem
 extern crate cgroups;
-use cgroups::{CgroupError, CgroupPid, Cgroup, Resources, PidResources};
 use cgroups::pid::{PidController, PidMax};
 use cgroups::Controller;
+use cgroups::{Cgroup, CgroupPid, PidResources, Resources};
 
 extern crate nix;
-use nix::unistd::{Pid, fork, ForkResult};
 use nix::sys::wait::{waitpid, WaitStatus};
+use nix::unistd::{fork, ForkResult, Pid};
 
 extern crate libc;
 use libc::pid_t;
@@ -20,7 +20,9 @@ fn create_and_delete_cgroup() {
     {
         let pidcontroller: &PidController = cg.controller_of().unwrap();
         pidcontroller.set_pid_max(PidMax::Value(1337));
-        assert_eq!(pidcontroller.get_pid_max(), Some(PidMax::Value(1337)));
+        let max = pidcontroller.get_pid_max();
+        assert!(max.is_ok());
+        assert_eq!(max.unwrap(), PidMax::Value(1337));
     }
     cg.delete();
 }
@@ -31,7 +33,8 @@ fn test_pids_current_is_zero() {
     let cg = Cgroup::new(&hier, String::from("test_pids_current_is_zero"));
     {
         let pidcontroller: &PidController = cg.controller_of().unwrap();
-        assert_eq!(pidcontroller.get_pid_current(), 0);
+        let current = pidcontroller.get_pid_current();
+        assert_eq!(current.unwrap(), 0);
     }
     cg.delete();
 }
@@ -42,7 +45,9 @@ fn test_pids_events_is_zero() {
     let cg = Cgroup::new(&hier, String::from("test_pids_events_is_zero"));
     {
         let pidcontroller: &PidController = cg.controller_of().unwrap();
-        assert_eq!(pidcontroller.get_pid_events(), 0);
+        let events = pidcontroller.get_pid_events();
+        assert!(events.is_ok());
+        assert_eq!(events.unwrap(), 0);
     }
     cg.delete();
 }
@@ -54,6 +59,7 @@ fn test_pid_events_is_not_zero() {
     {
         let pids: &PidController = cg.controller_of().unwrap();
         let before = pids.get_pid_events();
+        let before = before.unwrap();
 
         match fork() {
             Ok(ForkResult::Parent { child, .. }) => {
@@ -75,16 +81,17 @@ fn test_pid_events_is_not_zero() {
                 }
 
                 // Check pids.events
-                assert_eq!(pids.get_pid_events(), before + 1);
+                let events = pids.get_pid_events();
-            },
+                assert!(events.is_ok());
-            Ok(ForkResult::Child) => {
+                assert_eq!(events.unwrap(), before + 1);
-                loop {
+            }
-                    if pids.get_pid_max() == Some(PidMax::Value(1)) {
+            Ok(ForkResult::Child) => loop {
-                        if let Err(_) = fork() {
+                let pids_max = pids.get_pid_max();
-                            unsafe { libc::exit(0) };
+                if pids_max.is_ok() && pids_max.unwrap() == PidMax::Value(1) {
-                        } else {
+                    if let Err(_) = fork() {
-                            unsafe { libc::exit(1) };
+                        unsafe { libc::exit(0) };
-                        }
+                    } else {
+                        unsafe { libc::exit(1) };
                     }
                 }
             },

tests/resources.rs

@@ -1,8 +1,8 @@
 //! Integration test about setting resources using `apply()`
 extern crate cgroups;
 
-use cgroups::{Cgroup, Resources, PidResources};
 use cgroups::pid::{PidController, PidMax};
+use cgroups::{Cgroup, PidResources, Resources};
 
 #[test]
 fn pid_resources() {
@@ -18,9 +18,11 @@ fn pid_resources() {
         };
         cg.apply(&res);
 
-        /* verify */
+        // verify
         let pidcontroller: &PidController = cg.controller_of().unwrap();
-        assert_eq!(pidcontroller.get_pid_max(), Some(PidMax::Value(512)));
+        let pid_max = pidcontroller.get_pid_max();
+        assert_eq!(pid_max.is_ok(), true);
+        assert_eq!(pid_max.unwrap(), PidMax::Value(512));
     }
     cg.delete();
 }