Improve debugging and image creation

This commit is contained in:
Jeremy Soller
2016-02-24 18:23:25 -07:00
parent 8ff4863bbb
commit bae24a54b0
9 changed files with 96 additions and 22 deletions
+31 -1
View File
@@ -1,3 +1,5 @@
use collections::Vec;
use core::{fmt, mem, ops, slice, str};
use super::Extent;
@@ -12,6 +14,10 @@ pub struct Node {
}
impl Node {
pub const MODE_MASK: u64 = 0xF000;
pub const MODE_FILE: u64 = 0x8000;
pub const MODE_DIR: u64 = 0x4000;
pub fn default() -> Node {
Node {
name: [0; 256],
@@ -21,6 +27,20 @@ impl Node {
}
}
pub fn new(name: &str, mode: u64) -> Node {
let mut bytes = [0; 256];
for (mut b, c) in bytes.iter_mut().zip(name.bytes()) {
*b = c;
}
Node {
name: bytes,
mode: mode,
next: 0,
extents: [Extent::default(); 15]
}
}
pub fn name(&self) -> Result<&str, str::Utf8Error> {
let mut len = 0;
@@ -33,11 +53,21 @@ impl Node {
str::from_utf8(&self.name[..len])
}
pub fn size(&self) -> u64 {
self.extents.iter().fold(0, |size, extent| size + extent.length)
}
}
impl fmt::Debug for Node {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "Node {{ name: {:?}, mode: {:?}, next: {:?}, extents: {:?} }}", self.name(), self.mode, self.next, self.extents)
let extents: Vec<&Extent> = self.extents.iter().filter(|extent| -> bool { extent.length > 0 }).collect();
f.debug_struct("Node")
.field("name", &self.name())
.field("mode", &self.mode)
.field("next", &self.next)
.field("extents", &extents)
.finish()
}
}