diff options
Diffstat (limited to 'src/disk')
| -rw-r--r-- | src/disk/allocation.rs | 76 |
1 files changed, 52 insertions, 24 deletions
diff --git a/src/disk/allocation.rs b/src/disk/allocation.rs index 3622e4f..bfdba46 100644 --- a/src/disk/allocation.rs +++ b/src/disk/allocation.rs @@ -1,6 +1,6 @@ use crate::disk::block::{DataBlock, DoubleIndirectBlock, IndirectBlock, TripleIndirectBlock}; use crate::disk::inode::Inode; -use crate::memory::cached_block::convert; +use crate::memory::cached_block::{convert, convert_mut}; use crate::AyaFS; impl AyaFS { @@ -10,7 +10,7 @@ impl AyaFS { for index in inode.direct.iter_mut() { if !self.data_bitmap.query(*index as usize) { let block_index = self.data_bitmap.allocate().unwrap() as u32; - println!("allocating {} for direct", block_index); + // println!("allocating {} for direct", block_index); *index = block_index; inode.n_blocks += 1; // 当调用 get_inode_mut 拿出 &mut Inode 的时候对应的 block 在 cache 里已经脏了 @@ -24,11 +24,11 @@ impl AyaFS { .data_bitmap .allocate() .expect("No free space for new block") as u32; - println!("allocating {} for indirect", inode.single_indirect); + // println!("allocating {} for indirect", inode.single_indirect); } // 在 indirect block 里尝试分配 if let Some(block_index) = self.allocate_in_indirect(inode.single_indirect) { - println!("allocating {} in indirect", block_index); + // println!("allocating {} in indirect", block_index); inode.n_blocks += 1; return Some(block_index); } @@ -39,11 +39,11 @@ impl AyaFS { .data_bitmap .allocate() .expect("No free space for new block") as u32; - println!("allocating {} for double indirect", inode.double_indirect); + // println!("allocating {} for double indirect", inode.double_indirect); } // 在 double indirect block 里尝试分配 if let Some(block_index) = self.alloc_in_double_indirect(inode.double_indirect) { - println!("allocating {} in double indirect", block_index); + // println!("allocating {} in double indirect", block_index); inode.n_blocks += 1; return Some(block_index); } @@ -54,11 +54,11 @@ impl AyaFS { .data_bitmap .allocate() .expect("No free space for new block") as u32; - println!("allocating {} for triple indirect", inode.triple_indirect); + // println!("allocating {} for triple indirect", inode.triple_indirect); } // 在 double indirect block 里尝试分配 if let Some(block_index) = self.alloc_in_triple_indirect(inode.triple_indirect) { - println!("allocating {} in triple indirect", block_index); + // println!("allocating {} in triple indirect", block_index); inode.n_blocks += 1; return Some(block_index); } @@ -142,7 +142,7 @@ impl AyaFS { impl AyaFS { /// 从 inode 中删去最后一个 block - pub(crate) fn deallocate_block(&mut self, inode: &mut Inode) -> Option<u32> { + pub(crate) fn deallocate_block_for(&mut self, inode: &mut Inode) -> Option<u32> { // 如果 triple indirect 块存在, 则尝试从中销毁一个块 if self.data_bitmap.query(inode.triple_indirect as usize) { if let Some(block_index) = self.deallocate_from_triple_indirect(inode.triple_indirect) { @@ -189,28 +189,39 @@ impl AyaFS { fn deallocate_from_triple_indirect(&mut self, triple_indirect_entry: u32) -> Option<u32> { let triple_indirect_entry = triple_indirect_entry as usize; if let Some(triple_indirect_block) = self - .peek_block(triple_indirect_entry) + .get_block(triple_indirect_entry) .map(convert::<DataBlock, TripleIndirectBlock>) { + let mut triple_indirect_block = triple_indirect_block.clone(); + let mut block_modified = false; for double_indirect_entry in triple_indirect_block .block .double_indirect - .into_iter() + .iter_mut() .rev() { // 如果这个位置的 double indirect 存在 - if self.data_bitmap.query(double_indirect_entry as usize) { + if self.data_bitmap.query(*double_indirect_entry as usize) { // 尝试从中销毁一个块 if let Some(block_index) = - self.deallocate_from_double_indirect(double_indirect_entry) + self.deallocate_from_double_indirect(*double_indirect_entry) { + if block_modified { + self.update_block(triple_indirect_block); + } return Some(block_index); // 成功则直接返回 } else { // 失败则把这个 double indirect 销毁 - self.data_bitmap.deallocate(double_indirect_entry as usize); + let double_indirect_entry_to_deallocate = std::mem::replace(double_indirect_entry, 0); + self.data_bitmap.deallocate(double_indirect_entry_to_deallocate as usize); + triple_indirect_block.dirty = true; + block_modified = true; } } } + if block_modified { + self.update_block(triple_indirect_block); + } } None } @@ -218,21 +229,32 @@ impl AyaFS { fn deallocate_from_double_indirect(&mut self, double_indirect_entry: u32) -> Option<u32> { let double_indirect_entry = double_indirect_entry as usize; if let Some(double_indirect_block) = self - .peek_block(double_indirect_entry) + .get_block(double_indirect_entry) .map(convert::<DataBlock, DoubleIndirectBlock>) { - for indirect_entry in double_indirect_block.block.indirect.into_iter().rev() { + let mut double_indirect_block = double_indirect_block.clone(); + let mut block_modified = false; + for indirect_entry in double_indirect_block.block.indirect.iter_mut().rev() { // 如果这个位置的 indirect 存在 - if self.data_bitmap.query(indirect_entry as usize) { + if self.data_bitmap.query(*indirect_entry as usize) { // 尝试从中销毁一个块 - if let Some(block_index) = self.deallocate_from_indirect(indirect_entry) { + if let Some(block_index) = self.deallocate_from_indirect(*indirect_entry) { + if block_modified { + self.update_block(double_indirect_block); + } return Some(block_index); // 成功则直接返回 } else { // 失败则把这个 indirect 销毁 - self.data_bitmap.deallocate(indirect_entry as usize); + let indirect_entry_to_deallocate = std::mem::replace(indirect_entry, 0); + self.data_bitmap.deallocate(indirect_entry_to_deallocate as usize); + double_indirect_block.dirty = true; + block_modified = true; } } } + if block_modified { + self.update_block(double_indirect_block); + } } None } @@ -240,15 +262,21 @@ impl AyaFS { fn deallocate_from_indirect(&mut self, indirect_entry: u32) -> Option<u32> { let indirect_entry = indirect_entry as usize; if let Some(indirect_block) = self - .peek_block(indirect_entry) + .get_block(indirect_entry) .map(convert::<DataBlock, IndirectBlock>) { + let mut indirect_block = indirect_block.clone(); // 遍历 indirect block 里的每个 block - for entry in indirect_block.block.entries.into_iter().rev() { + for entry in indirect_block.block.entries.iter_mut().rev() { // 如果这个 block 存在, 销毁它 - if self.data_bitmap.query(entry as usize) { - self.data_bitmap.deallocate(entry as usize); - return Some(entry); + if self.data_bitmap.query(*entry as usize) { + let entry_to_deallocate = std::mem::replace(entry, 0); + + self.data_bitmap.deallocate(entry_to_deallocate as usize); + indirect_block.dirty = true; + self.update_block(indirect_block); + + return Some(entry_to_deallocate); } } } |