129 refactor virtual file system (#131)

Author: AlixANNERAUD

Cargo.toml

@@ -80,7 +80,7 @@ wasm_c_bindings = ["wasm", "wasm_bindings/c_bindings"]
 
 
 [workspace.dependencies]
-# - Internal crates
+# - Modules
 wasm_bindings = { path = "modules/bindings/wasm" }
 
 abi_context = { path = "modules/abi/context" }
@@ -108,6 +108,7 @@ network = { path = "modules/network" }
 peripherals = { path = "modules/peripherals" }
 bootsplash = { path = "modules/bootsplash" }
 internationalization = { path = "modules/internationalization" }
+testing = { path = "modules/testing" }
 
 # - Drivers
 drivers_core = { path = "drivers/core" }
@@ -173,6 +174,7 @@ members = [
   "executables/shell/command_line",
   "modules/executable",
   "executables/wasm",
+  "executables/wasm/tests/wasm_test",
   "executables/shell/graphical",
   "executables/terminal",
   "executables/settings",
@@ -196,6 +198,7 @@ members = [
   "modules/internationalization",
   "modules/internationalization/macros",
   "modules/graphics/fonts_generator",
+  "modules/testing",
 ]
 
 [patch.crates-io]

drivers/core/src/null.rs

@@ -1,25 +1,17 @@
-use file_system::{DeviceTrait, Size};
+use file_system::{CharacterDevice, DirectBaseOperations, MountOperations, Size};
 
 pub struct NullDevice;
 
-impl DeviceTrait for NullDevice {
-    fn read(&self, buffer: &mut [u8]) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(buffer.len() as u64))
+impl DirectBaseOperations for NullDevice {
+    fn read(&self, buffer: &mut [u8], _: Size) -> file_system::Result<usize> {
+        Ok(buffer.len() as _)
     }
 
-    fn write(&self, buffer: &[u8]) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(buffer.len() as u64))
-    }
-
-    fn get_size(&self) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(0))
+    fn write(&self, buffer: &[u8], _: Size) -> file_system::Result<usize> {
+        Ok(buffer.len() as _)
     }
+}
 
-    fn set_position(&self, _: &file_system::Position) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(0))
-    }
+impl MountOperations for NullDevice {}
 
-    fn flush(&self) -> file_system::Result<()> {
-        Ok(())
-    }
-}
+impl CharacterDevice for NullDevice {}

drivers/native/src/devices/window_screen/keyboard.rs

@@ -1,4 +1,4 @@
-use file_system::{DeviceTrait, Size};
+use file_system::{DirectBaseOperations, DirectCharacterDevice, MountOperations, Size};
 use graphics::{InputData, Key, State};
 use synchronization::{
     blocking_mutex::raw::{CriticalSectionRawMutex, RawMutex},
@@ -18,8 +18,8 @@ where
     }
 }
 
-impl<const N: usize> DeviceTrait for KeyboardDevice<CriticalSectionRawMutex, N> {
-    fn read(&self, buffer: &mut [u8]) -> file_system::Result<Size> {
+impl<const N: usize> DirectBaseOperations for KeyboardDevice<CriticalSectionRawMutex, N> {
+    fn read(&self, buffer: &mut [u8], _: Size) -> file_system::Result<usize> {
         // - Cast
         let data: &mut InputData = buffer
             .try_into()
@@ -32,22 +32,14 @@ impl<const N: usize> DeviceTrait for KeyboardDevice<CriticalSectionRawMutex, N>
 
         data.set_continue(!self.0.is_empty());
 
-        Ok(size_of::<InputData>().into())
+        Ok(size_of::<InputData>())
     }
 
-    fn write(&self, _: &[u8]) -> file_system::Result<Size> {
+    fn write(&self, _: &[u8], _: Size) -> file_system::Result<usize> {
         Err(file_system::Error::UnsupportedOperation)
     }
+}
 
-    fn get_size(&self) -> file_system::Result<Size> {
-        Ok(size_of::<InputData>().into())
-    }
+impl<const N: usize> MountOperations for KeyboardDevice<CriticalSectionRawMutex, N> {}
 
-    fn set_position(&self, _: &file_system::Position) -> file_system::Result<Size> {
-        Err(file_system::Error::UnsupportedOperation)
-    }
-
-    fn flush(&self) -> file_system::Result<()> {
-        Ok(())
-    }
-}
+impl<const N: usize> DirectCharacterDevice for KeyboardDevice<CriticalSectionRawMutex, N> {}

drivers/native/src/devices/window_screen/mod.rs

@@ -5,7 +5,6 @@ mod pointer;
 mod screen;
 mod window;
 
-use file_system::{Device, create_device};
 use graphics::{InputData, Key, Point, State};
 use synchronization::rwlock::RwLock;
 use synchronization::{blocking_mutex::raw::CriticalSectionRawMutex, channel::Channel};
@@ -23,7 +22,17 @@ static POINTER_RWLOCK: RwLock<CriticalSectionRawMutex, InputData> =
     RwLock::new(InputData::default_constant());
 static INNER_WINDOW: InnerWindow = InnerWindow::new();
 
-pub async fn new(resolution: Point) -> Result<(Device, Device, Device, Runner<'static>), String> {
+pub async fn new(
+    resolution: Point,
+) -> Result<
+    (
+        ScreenDevice<'static>,
+        PointerDevice,
+        KeyboardDevice<CriticalSectionRawMutex, 64>,
+        Runner<'static>,
+    ),
+    String,
+> {
     let window = Window::new(
         resolution,
         &INNER_WINDOW,
@@ -39,10 +48,5 @@ pub async fn new(resolution: Point) -> Result<(Device, Device, Device, Runner<'s
 
     let keyboard_device = KeyboardDevice::new(KEYBOARD_CHANNEL.receiver());
 
-    Ok((
-        create_device!(screen_device),
-        create_device!(pointer_device),
-        create_device!(keyboard_device),
-        event_loop,
-    ))
+    Ok((screen_device, pointer_device, keyboard_device, event_loop))
 }

drivers/native/src/devices/window_screen/pointer.rs

@@ -1,4 +1,4 @@
-use file_system::{DeviceTrait, Size};
+use file_system::{DirectBaseOperations, DirectCharacterDevice, MountOperations, Size};
 use graphics::InputData;
 use synchronization::{blocking_mutex::raw::CriticalSectionRawMutex, rwlock::RwLock};
 
@@ -10,8 +10,8 @@ impl PointerDevice {
     }
 }
 
-impl DeviceTrait for PointerDevice {
-    fn read(&self, buffer: &mut [u8]) -> file_system::Result<Size> {
+impl DirectBaseOperations for PointerDevice {
+    fn read(&self, buffer: &mut [u8], _: Size) -> file_system::Result<usize> {
         // - Cast the pointer data to the buffer.
         let data: &mut InputData = buffer
             .try_into()
@@ -23,22 +23,14 @@ impl DeviceTrait for PointerDevice {
             *data = *guard;
         }
 
-        Ok(size_of::<InputData>().into())
+        Ok(size_of::<InputData>())
     }
 
-    fn write(&self, _: &[u8]) -> file_system::Result<Size> {
+    fn write(&self, _: &[u8], _: Size) -> file_system::Result<usize> {
         Err(file_system::Error::UnsupportedOperation)
     }
+}
 
-    fn get_size(&self) -> file_system::Result<Size> {
-        Ok(size_of::<InputData>().into())
-    }
+impl MountOperations for PointerDevice {}
 
-    fn set_position(&self, _: &file_system::Position) -> file_system::Result<Size> {
-        Err(file_system::Error::UnsupportedOperation)
-    }
-
-    fn flush(&self) -> file_system::Result<()> {
-        Ok(())
-    }
-}
+impl DirectCharacterDevice for PointerDevice {}

drivers/native/src/devices/window_screen/screen.rs

@@ -1,4 +1,4 @@
-use file_system::{DeviceTrait, Size};
+use file_system::{DirectBaseOperations, DirectCharacterDevice, MountOperations, Size};
 use graphics::{ScreenReadData, ScreenWriteData};
 
 use crate::window_screen::inner_window::InnerWindow;
@@ -15,8 +15,8 @@ impl<'a> ScreenDevice<'a> {
     }
 }
 
-impl<'a> DeviceTrait for ScreenDevice<'a> {
-    fn read(&self, buffer: &mut [u8]) -> file_system::Result<file_system::Size> {
+impl<'a> DirectBaseOperations for ScreenDevice<'a> {
+    fn read(&self, buffer: &mut [u8], _: Size) -> file_system::Result<usize> {
         let data: &mut ScreenReadData = buffer
             .try_into()
             .map_err(|_| file_system::Error::InvalidParameter)?;
@@ -25,28 +25,20 @@ impl<'a> DeviceTrait for ScreenDevice<'a> {
 
         data.set_resolution(resolution);
 
-        Ok(Size::new(size_of::<Self>() as u64))
+        Ok(size_of::<Self>() as _)
     }
 
-    fn write(&self, buffer: &[u8]) -> file_system::Result<file_system::Size> {
+    fn write(&self, buffer: &[u8], _: Size) -> file_system::Result<usize> {
         let data: &ScreenWriteData = buffer
             .try_into()
             .map_err(|_| file_system::Error::InvalidParameter)?;
 
         futures::block_on(self.0.draw(data)).unwrap();
 
-        Ok(Size::new(size_of::<Self>() as u64))
-    }
-
-    fn get_size(&self) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(size_of::<Self>() as u64))
+        Ok(size_of::<Self>() as _)
     }
+}
 
-    fn set_position(&self, _: &file_system::Position) -> file_system::Result<file_system::Size> {
-        Err(file_system::Error::UnsupportedOperation)
-    }
+impl MountOperations for ScreenDevice<'_> {}
 
-    fn flush(&self) -> file_system::Result<()> {
-        Ok(())
-    }
-}
+impl DirectCharacterDevice for ScreenDevice<'_> {}

drivers/native/src/lib.rs

@@ -3,8 +3,5 @@
 extern crate alloc;
 
 mod devices;
-mod time;
 
 pub use devices::*;
-
-pub use time::*;

drivers/native/src/time.rs

@@ -1,42 +1,27 @@
-use file_system::{DeviceTrait, Size};
+use file_system::{DirectBaseOperations, DirectCharacterDevice, MountOperations, Size};
 
 pub struct RandomDevice;
 
-impl Default for RandomDevice {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl RandomDevice {
-    pub fn new() -> Self {
-        Self
-    }
-}
-
-impl DeviceTrait for RandomDevice {
-    fn read(&self, buffer: &mut [u8]) -> file_system::Result<file_system::Size> {
+impl DirectBaseOperations for RandomDevice {
+    fn read(&self, buffer: &mut [u8], _: Size) -> file_system::Result<usize> {
         getrandom::fill(buffer).map_err(|_| file_system::Error::Other)?;
 
-        Ok(buffer.len().into())
+        Ok(buffer.len())
     }
 
-    fn write(&self, _buffer: &[u8]) -> file_system::Result<file_system::Size> {
+    fn write(&self, _: &[u8], _: Size) -> file_system::Result<usize> {
         Err(file_system::Error::UnsupportedOperation)
     }
 
-    fn get_size(&self) -> file_system::Result<file_system::Size> {
-        Ok(Size::new(0))
-    }
-
     fn set_position(
         &self,
+        _: Size,
         _position: &file_system::Position,
     ) -> file_system::Result<file_system::Size> {
         Err(file_system::Error::UnsupportedOperation)
     }
-
-    fn flush(&self) -> file_system::Result<()> {
-        Ok(())
-    }
 }
+
+impl MountOperations for RandomDevice {}
+
+impl DirectCharacterDevice for RandomDevice {}

drivers/shared/src/devices/random.rs

@@ -25,3 +25,5 @@ embassy-executor = { workspace = true, default-features = false, features = [
 
 [dev-dependencies]
 little_fs = { workspace = true }
+abi_definitions = { workspace = true }
+critical-section = { workspace = true, features = ["std"] }