Compare commits

...
2 Commits
Author SHA1 Message Date
juju 184030a45e add lseek
continuous-integration/drone/push Build is passing
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
2022-12-25 17:07:40 +01:00
juju 23184f56a3 move close in fd trait
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
2022-12-25 16:53:48 +01:00
6 changed files with 27 additions and 17 deletions

No files matched your search

+5 -3
View File
@@ -35,11 +35,11 @@ impl FDTable {
}
}
pub fn unregister_fd(&mut self, fd: FDt) {
self.table.remove(&fd.borrow().get_fd());
pub fn unregister_fd(&mut self, fd: &dyn FileDescriptor) {
self.table.remove(&fd.get_fd());
println!(
"Unregistered fd: {:?}",
fd.borrow().get_fd()
fd.get_fd()
);
}
@@ -57,4 +57,6 @@ pub trait FileDescriptor {
fn get_fd(&self) -> FDId;
async fn write(&mut self, buf: &[u8], count: usize) -> isize;
async fn read(&mut self, buf: &mut [u8], count: usize) -> isize;
async fn close(&mut self);
async fn lseek(&mut self, offset: i32, whence: u32) -> i32;
}
+15
View File
@@ -60,4 +60,19 @@ impl FileDescriptor for IsoFD {
read
}
async fn close(&mut self) {
FD_TABLE.lock().await.unregister_fd(self);
}
async fn lseek(&mut self, offset: i32, whence: u32) -> i32 {
use crate::syscalls::io::*;
match whence {
w if w == SEEK_SET => self.offset = offset as u32,
w if w == SEEK_CUR => self.offset = (self.offset as i32 + offset) as u32,
w if w == SEEK_END => self.offset = (self.size as i32 + offset) as u32,
_ => {}
};
self.offset as i32
}
}
+1 -5
View File
@@ -2,7 +2,7 @@ mod fd;
pub mod iso9660;
use crate::drivers::atapi::read_block;
use crate::fd::{FDt, FD_TABLE};
use crate::fd::{FDt};
use crate::utils::unserialize;
use super::FileSystem;
@@ -74,10 +74,6 @@ impl FileSystem for IsoFS {
Some(IsoFD::new(curr_entry).await)
}
async fn close(&mut self, fd: FDt) {
FD_TABLE.lock().await.unregister_fd(fd.clone());
}
}
-5
View File
@@ -17,7 +17,6 @@ lazy_static! {
#[async_trait(?Send)]
pub trait FileSystem {
async fn open(&mut self, path: &str, flags: u32) -> Option<FDt>;
async fn close(&mut self, fd: FDt);
}
pub struct VirtualFS {
@@ -37,8 +36,4 @@ impl FileSystem for VirtualFS {
async fn open(&mut self, path: &str, flags: u32) -> Option<FDt> {
self.fs.borrow_mut().open(path, flags).await
}
async fn close(&mut self, fd: FDt) {
self.fs.borrow_mut().close(fd).await
}
}
+6 -1
View File
@@ -77,5 +77,10 @@ async fn get_file() {
serial_println!("{:?}", read);
serial_println!("{}", alloc::str::from_utf8(&buf).unwrap());
fs::VIRTUAL_FS.lock().await.close(fd).await;
fd.borrow_mut().lseek(10, syscalls::io::SEEK_SET).await;
fd.borrow_mut().read(&mut buf, 100).await;
serial_println!("{}", alloc::str::from_utf8(&buf).unwrap());
fd.borrow_mut().close().await;
}
-3
View File
@@ -2,9 +2,6 @@
pub const O_RDONLY: u32 = 0;
// seek flags
#[allow(dead_code)]
pub const SEEK_SET: u32 = 0;
#[allow(dead_code)]
pub const SEEK_CUR: u32 = 1;
#[allow(dead_code)]
pub const SEEK_END: u32 = 2;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.