mu2pwryse
/
pmhuj4vri
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable NLL and simplify code.

Browse Source
master
WangRunji 6 years ago
parent 3f71a36c66
commit b0b1e0b307
3 changed files with 47 additions and 66 deletions
Show Stats Download Patch File Download Diff File

1
src/lib.rs
Unescape View File

@ -1,5 +1,6 @@
#![feature(alloc)] #![feature(alloc)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(nll)]
#![cfg_attr(target_arch = "riscv", feature(match_default_bindings))] #![cfg_attr(target_arch = "riscv", feature(match_default_bindings))]
#![no_std] #![no_std]

77
src/sfs.rs
Unescape View File

@ -10,7 +10,7 @@ use structs::*;
use vfs::{self, Device}; use vfs::{self, Device};
use util::*; use util::*;
trait DeviceExt: Device { impl Device {
fn read_block(&mut self, id: BlockId, offset: usize, buf: &mut [u8]) -> vfs::Result<()> { fn read_block(&mut self, id: BlockId, offset: usize, buf: &mut [u8]) -> vfs::Result<()> {
debug_assert!(offset + buf.len() <= BLKSIZE); debug_assert!(offset + buf.len() <= BLKSIZE);
match self.read_at(id * BLKSIZE + offset, buf) { match self.read_at(id * BLKSIZE + offset, buf) {
@ -33,8 +33,6 @@ trait DeviceExt: Device {
} }
} }
impl DeviceExt for Device {}
type Ptr<T> = Rc<RefCell<T>>; type Ptr<T> = Rc<RefCell<T>>;
/// inode for sfs /// inode for sfs
@ -45,8 +43,6 @@ pub struct INode {
id: INodeId, id: INodeId,
/// Weak reference to SFS, used by almost all operations /// Weak reference to SFS, used by almost all operations
fs: Weak<SimpleFileSystem>, fs: Weak<SimpleFileSystem>,
// Point to inode in ucore VFS, used by c_interface
// ucore_inode: *const (),
} }
impl Debug for INode { impl Debug for INode {
@ -321,7 +317,7 @@ impl vfs::INode for INode {
self._resize(old_size + BLKSIZE).unwrap(); self._resize(old_size + BLKSIZE).unwrap();
self._write_at(old_size, entry.as_buf()).unwrap(); self._write_at(old_size, entry.as_buf()).unwrap();
inode.borrow_mut().nlinks_inc(); inode.borrow_mut().nlinks_inc();
if (type_ == vfs::FileType::Dir) { if type_ == vfs::FileType::Dir {
inode.borrow_mut().nlinks_inc();//for . inode.borrow_mut().nlinks_inc();//for .
self.nlinks_inc();//for .. self.nlinks_inc();//for ..
} }
@ -343,12 +339,12 @@ impl vfs::INode for INode {
let inode = fs.get_inode(inode_id); let inode = fs.get_inode(inode_id);
let type_ = inode.borrow().disk_inode.type_; let type_ = inode.borrow().disk_inode.type_;
if (type_ == FileType::Dir) { if type_ == FileType::Dir {
// only . and .. // only . and ..
assert!(inode.borrow().disk_inode.blocks == 2); assert_eq!(inode.borrow().disk_inode.blocks, 2);
} }
inode.borrow_mut().nlinks_dec(); inode.borrow_mut().nlinks_dec();
if (type_ == FileType::Dir) { if type_ == FileType::Dir {
inode.borrow_mut().nlinks_dec();//for . inode.borrow_mut().nlinks_dec();//for .
self.nlinks_dec();//for .. self.nlinks_dec();//for ..
} }
@ -426,7 +422,7 @@ impl vfs::INode for INode {
self.remove_dirent_page(entry_id); self.remove_dirent_page(entry_id);
if (inode.borrow().info().unwrap().type_ == vfs::FileType::Dir) { if inode.borrow().info().unwrap().type_ == vfs::FileType::Dir {
self.nlinks_dec(); self.nlinks_dec();
dest.nlinks_inc(); dest.nlinks_inc();
} }
@ -468,7 +464,7 @@ impl Drop for INode {
fn drop(&mut self) { fn drop(&mut self) {
use vfs::INode; use vfs::INode;
self.sync().expect("failed to sync"); self.sync().expect("failed to sync");
if (self.disk_inode.nlinks <= 0) { if self.disk_inode.nlinks <= 0 {
let fs = self.fs.upgrade().unwrap(); let fs = self.fs.upgrade().unwrap();
self._resize(0); self._resize(0);
self.disk_inode.sync(); self.disk_inode.sync();
@ -536,20 +532,18 @@ impl SimpleFileSystem {
let sfs = SimpleFileSystem { let sfs = SimpleFileSystem {
super_block: RefCell::new(Dirty::new_dirty(super_block)), super_block: RefCell::new(Dirty::new_dirty(super_block)),
free_map: RefCell::new(Dirty::new_dirty(free_map)), free_map: RefCell::new(Dirty::new_dirty(free_map)),
inodes: RefCell::new(BTreeMap::<INodeId, Ptr<INode>>::new()), inodes: RefCell::new(BTreeMap::new()),
device: RefCell::new(device), device: RefCell::new(device),
self_ptr: Weak::default(), self_ptr: Weak::default(),
}.wrap(); }.wrap();
// Init root INode // Init root INode
{ use vfs::INode;
use vfs::INode; let root = sfs._new_inode(BLKN_ROOT, Dirty::new_dirty(DiskINode::new_dir()));
let root = sfs._new_inode(BLKN_ROOT, Dirty::new_dirty(DiskINode::new_dir())); root.borrow_mut().init_dir_entry(BLKN_ROOT).unwrap();
root.borrow_mut().init_dir_entry(BLKN_ROOT).unwrap(); root.borrow_mut().nlinks_inc();//for .
root.borrow_mut().nlinks_inc();//for . root.borrow_mut().nlinks_inc();//for ..(root's parent is itself)
root.borrow_mut().nlinks_inc();//for ..(root's parent is itself) root.borrow_mut().sync().unwrap();
root.borrow_mut().sync().unwrap();
}
sfs sfs
} }
@ -628,22 +622,13 @@ impl SimpleFileSystem {
} }
fn flush_unreachable_inodes(&self) { fn flush_unreachable_inodes(&self) {
let mut inodes = self.inodes.borrow_mut(); let mut inodes = self.inodes.borrow_mut();
let ids: Vec<_> = inodes.keys().cloned().collect(); let remove_ids: Vec<_> = inodes.iter().filter(|(_, inode)| {
for id in ids.iter() { use vfs::INode;
let mut should_remove = false; Rc::strong_count(inode) <= 1
// Since non-lexical-lifetime is not stable... && inode.borrow().info().unwrap().nlinks == 0
{ }).map(|(&id, _)| id).collect();
let inodeRc = inodes.get(&id).unwrap(); for id in remove_ids.iter() {
if Rc::strong_count(inodeRc) <= 1 { inodes.remove(&id);
use vfs::INode;
if inodeRc.borrow().info().unwrap().nlinks == 0 {
should_remove = true;
}
}
}
if (should_remove) {
inodes.remove(&id);
}
} }
} }
} }
@ -651,19 +636,15 @@ impl SimpleFileSystem {
impl vfs::FileSystem for SimpleFileSystem { impl vfs::FileSystem for SimpleFileSystem {
/// Write back super block if dirty /// Write back super block if dirty
fn sync(&self) -> vfs::Result<()> { fn sync(&self) -> vfs::Result<()> {
{ let mut super_block = self.super_block.borrow_mut();
let mut super_block = self.super_block.borrow_mut(); if super_block.dirty() {
if super_block.dirty() { self.device.borrow_mut().write_at(BLKSIZE * BLKN_SUPER, super_block.as_buf()).unwrap();
self.device.borrow_mut().write_at(BLKSIZE * BLKN_SUPER, super_block.as_buf()).unwrap(); super_block.sync();
super_block.sync();
}
} }
{ let mut free_map = self.free_map.borrow_mut();
let mut free_map = self.free_map.borrow_mut(); if free_map.dirty() {
if free_map.dirty() { self.device.borrow_mut().write_at(BLKSIZE * BLKN_FREEMAP, free_map.as_buf()).unwrap();
self.device.borrow_mut().write_at(BLKSIZE * BLKN_FREEMAP, free_map.as_buf()).unwrap(); free_map.sync();
free_map.sync();
}
} }
for inode in self.inodes.borrow().values() { for inode in self.inodes.borrow().values() {
use vfs::INode; use vfs::INode;

35
src/tests.rs
Unescape View File

@ -110,24 +110,23 @@ fn resize() {
#[test] #[test]
fn create_then_lookup() { fn create_then_lookup() {
let sfs = _create_new_sfs(); let sfs = _create_new_sfs();
{ let root = sfs.root_inode();
let root = sfs.root_inode();
assert!(Rc::ptr_eq(&root.borrow().lookup(".").unwrap(), &root), "failed to find .");
assert!(Rc::ptr_eq(&root.borrow().lookup(".").unwrap(), &root), "failed to find ."); assert!(Rc::ptr_eq(&root.borrow().lookup("..").unwrap(), &root), "failed to find ..");
assert!(Rc::ptr_eq(&root.borrow().lookup("..").unwrap(), &root), "failed to find ..");
let file1 = root.borrow_mut().create("file1", FileType::File)
let file1 = root.borrow_mut().create("file1", FileType::File) .expect("failed to create file1");
.expect("failed to create file1"); assert!(Rc::ptr_eq(&root.borrow().lookup("file1").unwrap(), &file1), "failed to find file1");
assert!(Rc::ptr_eq(&root.borrow().lookup("file1").unwrap(), &file1), "failed to find file1"); assert!(root.borrow().lookup("file2").is_err(), "found non-existent file");
assert!(root.borrow().lookup("file2").is_err(), "found non-existent file");
let dir1 = root.borrow_mut().create("dir1", FileType::Dir)
let dir1 = root.borrow_mut().create("dir1", FileType::Dir) .expect("failed to create dir1");
.expect("failed to create dir1"); let file2 = dir1.borrow_mut().create("file2", FileType::File)
let file2 = dir1.borrow_mut().create("file2", FileType::File) .expect("failed to create /dir1/file2");
.expect("failed to create /dir1/file2"); assert!(Rc::ptr_eq(&root.borrow().lookup("dir1/file2").unwrap(), &file2), "failed to find dir1/file1");
assert!(Rc::ptr_eq(&root.borrow().lookup("dir1/file2").unwrap(), &file2), "failed to find dir1/file1"); assert!(Rc::ptr_eq(&dir1.borrow().lookup("..").unwrap(), &root), "failed to find .. from dir1");
assert!(Rc::ptr_eq(&dir1.borrow().lookup("..").unwrap(), &root), "failed to find .. from dir1");
}
sfs.sync().unwrap(); sfs.sync().unwrap();
} }

Write Preview
Loading…
Cancel
Save