fix mounting on absolute paths, inprove mount size reset logic

Author: wasm-forge

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
 
+## [v0.10.1]
+- Fix mounting on absolute paths
+- Improved mounted memory size reset logic
+
+## [v0.10.0]
+- Optimized work with folders
+- Refactor Metadata and DirEntry structures
+- Reduce copy of DirEntry
+- Add fast direntry lookup by name
+
 ## [v0.9.0]
 - switch to ic-stable-structures v0.7
 - refactor project structure
@@ -88,7 +98,8 @@
 ## [v0.5.0]
 - *API change:* init with memory manager using memory index range rather than first memory index.
 
-[unreleased]: https://github.com/wasm-forge/stable-fs/compare/v0.9.0...main
+[v0.10.1]: https://github.com/wasm-forge/stable-fs/compare/v0.10.0...v0.10.1
+[v0.10.0]: https://github.com/wasm-forge/stable-fs/compare/v0.9.0...v0.10.0
 [v0.9.0]: https://github.com/wasm-forge/stable-fs/compare/v0.8.1...v0.9.0
 [v0.8.1]: https://github.com/wasm-forge/stable-fs/compare/v0.8.0...v0.8.1
 [v0.8.0]: https://github.com/wasm-forge/stable-fs/compare/v0.7.3...v0.8.0

stable-fs/src/fs.rs

@@ -186,6 +186,8 @@ impl FileSystem {
         filename: &str,
         memory: Box<dyn Memory>,
     ) -> Result<(), Error> {
+        let filename = filename.strip_prefix('/').unwrap_or(filename);
+
         // create a file for the mount
         let fd = self.open(
             self.root_fd,
@@ -207,6 +209,8 @@ impl FileSystem {
 
     // initialize mounted memory with the data stored in the host file
     pub fn init_memory_file(&mut self, filename: &str) -> Result<(), Error> {
+        let filename = filename.strip_prefix('/').unwrap_or(filename);
+
         // create a file for the mount
         let fd = self.open(
             self.root_fd,
@@ -228,6 +232,8 @@ impl FileSystem {
 
     // store content of the currently active memory file to the file system
     pub fn store_memory_file(&mut self, filename: &str) -> Result<(), Error> {
+        let filename = filename.strip_prefix('/').unwrap_or(filename);
+
         // create a file for the mount
         let fd = self.open(
             self.root_fd,
@@ -249,6 +255,8 @@ impl FileSystem {
 
     // Unmount memory, the system will continue to work with the file in normal mode.
     pub fn unmount_memory_file(&mut self, filename: &str) -> Result<Box<dyn Memory>, Error> {
+        let filename = filename.strip_prefix('/').unwrap_or(filename);
+
         // create a file for the mount
         let fd = self.open(
             self.root_fd,

stable-fs/src/storage/stable.rs

@@ -989,14 +989,28 @@ impl<M: Memory> Storage for StableStorage<M> {
         // get the file metadata (we are not mounted at this point)
         let mut file_meta = self.get_metadata(node)?;
 
+        let memory_size = memory.size();
+
         // activate mount
         self.active_mounts.insert(node, memory);
 
-        if let Ok(_old_mounted_meta) = self.get_metadata(node) {
-            // do nothing, we already have the metadata
+        if let Ok(old_mounted_meta) = self.get_metadata(node) {
+            // the connected memory might have a different size from the old memory, we need to decide which size to use...
+            //
+            // Solution:
+            // if the new memory size in bytes is smaller than the old mounted metadata file size,
+            // we assume this is a new and unknown memory, and reinitialize the metadata size to match the total number of bytes
+            // provided in memory
+
+            if memory_size * WASM_PAGE_SIZE_IN_BYTES < old_mounted_meta.size {
+                let mut meta = old_mounted_meta.clone();
+
+                meta.size = memory_size * WASM_PAGE_SIZE_IN_BYTES;
+                self.put_metadata(node, &meta)?;
+            }
         } else {
-            // take a copy of the file meta, set the size to 0 by default
-            file_meta.size = 0;
+            // take a copy of the file meta, set the size to the size of the memory
+            file_meta.size = memory_size * WASM_PAGE_SIZE_IN_BYTES;
 
             // update mounted metadata
             self.put_metadata(node, &file_meta)?;

stable-fs/src/storage/transient.rs

@@ -332,24 +332,35 @@ impl Storage for TransientStorage {
         }
 
         // do extra meta preparation
-        let mut meta = self
-            .metadata
-            .get(&node)
-            .ok_or(Error::NoSuchFileOrDirectory)?
-            .clone();
+        // get the file metadata (we are not mounted at this point)
+        let mut file_meta = self.get_metadata(node)?;
 
+        let memory_size = memory.size();
+
+        // activate mount
         self.active_mounts.insert(node, memory);
 
-        let new_mounted_meta = if let Some(old_mounted_meta) = self.mounted_meta.get(&node) {
-            // we can change here something for the new mounted meta
-            old_mounted_meta.clone()
+        if let Ok(old_mounted_meta) = self.get_metadata(node) {
+            // the connected memory might have a different size from the old memory, we need to decide which size to use...
+            //
+            // Solution:
+            // if the new memory size in bytes is smaller than the old mounted metadata file size,
+            // we assume this is a new and unknown memory, and reinitialize the metadata size to match the total number of bytes
+            // provided in memory
+
+            if memory_size * WASM_PAGE_SIZE_IN_BYTES < old_mounted_meta.size {
+                let mut meta = old_mounted_meta.clone();
+
+                meta.size = memory_size * WASM_PAGE_SIZE_IN_BYTES;
+                self.put_metadata(node, &meta)?;
+            }
         } else {
-            // take a copy of the file meta, set size to 0 by default
-            meta.size = 0;
-            meta
-        };
+            // take a copy of the file meta, set the size to the size of the memory
+            file_meta.size = memory_size * WASM_PAGE_SIZE_IN_BYTES;
 
-        self.mounted_meta.insert(node, new_mounted_meta);
+            // update mounted metadata
+            self.put_metadata(node, &file_meta)?;
+        };
 
         Ok(())
     }