From 1eac97eea4ec0bcef0be061a2cba93a584355283 Mon Sep 17 00:00:00 2001 From: Chuyan Zhang Date: Thu, 30 Nov 2023 02:15:06 -0800 Subject: Add real disk i/o, add mkfs.aya (not yet implemented) --- ayafs/src/block_device/disk.rs | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 ayafs/src/block_device/disk.rs (limited to 'ayafs/src/block_device/disk.rs') diff --git a/ayafs/src/block_device/disk.rs b/ayafs/src/block_device/disk.rs new file mode 100644 index 0000000..3f0b018 --- /dev/null +++ b/ayafs/src/block_device/disk.rs @@ -0,0 +1,47 @@ +use std::cell::RefCell; +use std::fs::File; +use std::io::{Read, Seek, SeekFrom, Write}; +use std::path::{Path, PathBuf}; +use crate::block_device::{BLOCK_SIZE, BlockDevice}; + +pub struct Disk { + disk_path: PathBuf, + device: RefCell, +} + +impl Disk { + pub fn new(disk_path: PathBuf) -> Self { + let device = File::options() + .read(true) + .write(true) + .open(disk_path.as_path()) + .unwrap(); + // let device = File::open(disk_path.as_path()).unwrap(); + Self { + disk_path, + device: RefCell::new(device), + } + } +} + +impl BlockDevice for Disk { + fn read(&self, block_id: usize, buffer: &mut [u8]) { + let mut device = self.device.borrow_mut(); + device + .seek(SeekFrom::Start((block_id * BLOCK_SIZE) as u64)) + .expect("Unable to seek!"); + device + .read_exact(buffer) + .expect("Failed to read 4096 bytes!"); + } + + fn write(&self, block_id: usize, buffer: &[u8]) { + let mut device = self.device.borrow_mut(); + device + .seek(SeekFrom::Start((block_id * BLOCK_SIZE) as u64)) + .expect("Unable to seek!"); + device + .write_all(buffer) + .expect("Unable to write 4096 bytes!"); + } +} \ No newline at end of file -- cgit v1.2.3-70-g09d2