move close in fd trait

Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>

src/fd/mod.rs

@@ -35,11 +35,11 @@ impl FDTable {
         }
     }
 
-    pub fn unregister_fd(&mut self, fd: FDt) {
+    pub fn unregister_fd(&mut self, fd: &dyn FileDescriptor) {
-        self.table.remove(&fd.borrow().get_fd());
+        self.table.remove(&fd.get_fd());
         println!(
             "Unregistered fd: {:?}",
-            fd.borrow().get_fd()
+            fd.get_fd()
         );
     }
 
@@ -57,4 +57,5 @@ 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);
 }

src/fs/iso/fd.rs

@@ -60,4 +60,8 @@ impl FileDescriptor for IsoFD {
 
         read
     }
+
+    async fn close(&mut self) {
+        FD_TABLE.lock().await.unregister_fd(self);
+    }
 }

src/fs/iso/mod.rs

@@ -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());
-    }
 }
 
 

src/fs/mod.rs

@@ -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
-    }
 }

src/lib.rs

@@ -77,5 +77,5 @@ 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().close().await;
 }