Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove DirentBytes

Browse source
This commit is contained in:
Yifan Wu 2021-03-04 03:27:46 +08:00
parent d1cde16ddb
commit 42b5b44ff8
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
easy-fs/src/layout.rs
View file

@ -407,10 +407,13 @@ pub struct DirEntry {
pub const DIRENT_SZ: usize = 32; pub const DIRENT_SZ: usize = 32;
//pub type DirentBlock = [DirEntry; BLOCK_SZ / DIRENT_SZ];
pub type DirentBytes = [u8; DIRENT_SZ];
impl DirEntry { impl DirEntry {
pub fn empty() -> Self {
Self {
name: [0u8; NAME_LENGTH_LIMIT + 1],
inode_number: 0,
}
}
pub fn new(name: &str, inode_number: u32) -> Self { pub fn new(name: &str, inode_number: u32) -> Self {
let mut bytes = [0u8; NAME_LENGTH_LIMIT + 1]; let mut bytes = [0u8; NAME_LENGTH_LIMIT + 1];
&mut bytes[..name.len()].copy_from_slice(name.as_bytes()); &mut bytes[..name.len()].copy_from_slice(name.as_bytes());
@ -419,18 +422,20 @@ impl DirEntry {
inode_number, inode_number,
} }
} }
pub fn into_bytes(&self) -> &DirentBytes { pub fn as_bytes(&self) -> &[u8] {
unsafe { unsafe {
&*(self as *const Self as usize as *const DirentBytes) core::slice::from_raw_parts(
self as *const _ as usize as *const u8,
DIRENT_SZ,
)
} }
} }
pub fn from_bytes(bytes: &DirentBytes) -> &Self { pub fn as_bytes_mut(&mut self) -> &mut [u8] {
unsafe { &*(bytes.as_ptr() as usize as *const Self) }
}
#[allow(unused)]
pub fn from_bytes_mut(bytes: &mut DirentBytes) -> &mut Self {
unsafe { unsafe {
&mut *(bytes.as_mut_ptr() as usize as *mut Self) core::slice::from_raw_parts_mut(
self as *mut _ as usize as *mut u8,
DIRENT_SZ,
)
} }
} }
pub fn name(&self) -> &str { pub fn name(&self) -> &str {

14
easy-fs/src/vfs.rs
View file

@ -3,7 +3,6 @@ use super::{
DiskInode, DiskInode,
DiskInodeType, DiskInodeType,
DirEntry, DirEntry,
DirentBytes,
EasyFileSystem, EasyFileSystem,
DIRENT_SZ, DIRENT_SZ,
get_block_cache, get_block_cache,
@ -63,17 +62,16 @@ impl Inode {
// assert it is a directory // assert it is a directory
assert!(disk_inode.is_dir()); assert!(disk_inode.is_dir());
let file_count = (disk_inode.size as usize) / DIRENT_SZ; let file_count = (disk_inode.size as usize) / DIRENT_SZ;
let mut dirent_space: DirentBytes = Default::default(); let mut dirent = DirEntry::empty();
for i in 0..file_count { for i in 0..file_count {
assert_eq!( assert_eq!(
disk_inode.read_at( disk_inode.read_at(
DIRENT_SZ * i, DIRENT_SZ * i,
&mut dirent_space, dirent.as_bytes_mut(),
&self.block_device, &self.block_device,
), ),
DIRENT_SZ, DIRENT_SZ,
); );
let dirent = DirEntry::from_bytes(&dirent_space);
if dirent.name() == name { if dirent.name() == name {
return Some(dirent.inode_number() as u32); return Some(dirent.inode_number() as u32);
} }
@ -144,7 +142,7 @@ impl Inode {
let dirent = DirEntry::new(name, new_inode_id); let dirent = DirEntry::new(name, new_inode_id);
root_inode.write_at( root_inode.write_at(
file_count * DIRENT_SZ, file_count * DIRENT_SZ,
dirent.into_bytes(), dirent.as_bytes(),
&self.block_device, &self.block_device,
); );
}); });
@ -164,16 +162,16 @@ impl Inode {
let file_count = (disk_inode.size as usize) / DIRENT_SZ; let file_count = (disk_inode.size as usize) / DIRENT_SZ;
let mut v: Vec<String> = Vec::new(); let mut v: Vec<String> = Vec::new();
for i in 0..file_count { for i in 0..file_count {
let mut dirent_bytes: DirentBytes = Default::default(); let mut dirent = DirEntry::empty();
assert_eq!( assert_eq!(
disk_inode.read_at( disk_inode.read_at(
i * DIRENT_SZ, i * DIRENT_SZ,
&mut dirent_bytes, dirent.as_bytes_mut(),
&self.block_device, &self.block_device,
), ),
DIRENT_SZ, DIRENT_SZ,
); );
v.push(String::from(DirEntry::from_bytes(&dirent_bytes).name())); v.push(String::from(dirent.name()));
} }
v v
}) })