ext4

Cargo.toml

@@ -1,7 +1,9 @@
 [workspace]
 members = [
     "crates/icfs",
+    "crates/icfs-ext4",
     "crates/icfs-fatfs",
     "examples/icfs",
+    "examples/ext4",
     "examples/fatfs",
 ]

crates/icfs-ext4/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "icfs-ext4"
+version = "0.1.0"
+edition = "2018"
+authors = ["Paul Young <[email protected]>"]
+
+[lib]
+path = "lib.rs"
+crate-type = ["cdylib", "lib"]
+
+[dependencies]
+ext4 = { git = "https://github.com/FauxFaux/ext4-rs", rev = "1858f9d11ba3454f5a274275e059f631fb7a3b01" }
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
+icfs = { path = "../../crates/icfs" }
+positioned-io = "0.2"

crates/icfs-ext4/lib.rs

@@ -0,0 +1,3 @@
+impl positioned_io::ReadAt for icfs::StableMemory {
+
+}

crates/icfs-fatfs/Cargo.toml

@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Paul Young <[email protected]>"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 path = "lib.rs"
 crate-type = ["cdylib", "lib"]

dfx.json

@@ -8,6 +8,12 @@
       "candid": "examples/icfs/icfs.did",
       "wasm": "result/lib/icfs_example.wasm"
     },
+    "ext4": {
+      "type": "custom",
+      "build": "nix build '.#ext4-example'",
+      "candid": "examples/ext4/ext4.did",
+      "wasm": "result/lib/ext4_example.wasm"
+    },
     "fatfs": {
       "type": "custom",
       "build": "nix build '.#fatfs-example'",

examples/ext4/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "ext4-example"
+version = "0.1.0"
+edition = "2018"
+authors = ["Paul Young <[email protected]>"]
+
+[lib]
+path = "lib.rs"
+crate-type = ["cdylib", "lib"]
+
+[dependencies]
+ext4 = { git = "https://github.com/FauxFaux/ext4-rs", rev = "1858f9d11ba3454f5a274275e059f631fb7a3b01" }
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
+ic-cdk-macros = "0.3"
+icfs = { path = "../../crates/icfs" }
+icfs-ext4 = { path = "../../crates/icfs-ext4" }

examples/ext4/ext4.did

@@ -0,0 +1,5 @@
+service : {
+  ls : () -> (vec text) query;
+  write_file : (filename : text, contents : text) -> ();
+  read_file : (filename : text) -> (text) query;
+}

examples/ext4/lib.rs

@@ -0,0 +1,58 @@
+use ic_cdk_macros::{query, update};
+
+thread_local! {
+    static STABLE_MEMORY: std::cell::RefCell<icfs::StableMemory>
+        = std::cell::RefCell::new(icfs::StableMemory::default());
+
+    static VOL: std::cell::RefCell<ext4::SuperBlock<icfs::StableMemory>> = {
+        let vol: Result<ext4::SuperBlock<icfs::StableMemory>> = STABLE_MEMORY.with(|stable_memory| {
+            let stable_memory = *stable_memory.borrow();
+
+            #[cfg(target_arch = "wasm32")]
+            let memory_pages = core::arch::wasm32::memory_size(0)
+                .try_into()
+                .map_err(|error| std::io::Error::new(std::io::ErrorKind::Other, error))?;
+
+            #[cfg(not(target_arch = "wasm32"))]
+            let memory_pages = 19;
+
+            icfs::StableMemory::grow(memory_pages)?;
+
+            let mut options = ext4::Options::default();
+            options.checksums = ext4::Checksums::Enabled;
+
+            let vol = ext4::SuperBlock::new_with_options(stable_memory, &options).expect("ext4 volume");
+
+            Ok(vol)
+        });
+
+        std::cell::RefCell::new(vol.unwrap())
+    }
+}
+
+#[query]
+fn ls() -> Vec<String> {
+    _ls().unwrap()
+}
+
+fn _ls() -> std::io::Result<Vec<String>> {
+  Ok(vec!("FIXME".to_string()))
+}
+
+#[query]
+fn read_file(filename: String) -> String {
+    _read_file(filename).unwrap()
+}
+
+fn _read_file(filename: String) -> std::io::Result<String> {
+    Ok("FIXME".to_string())
+}
+
+#[update]
+fn write_file(filename: String, contents: String) {
+    _write_file(filename, contents).unwrap();
+}
+
+fn _write_file(filename: String, contents: String) -> std::io::Result<()> {
+    Ok(())
+}

examples/ext4/test.ic-repl

@@ -0,0 +1,29 @@
+import ext4 = "rrkah-fqaaa-aaaaa-aaaaq-cai" as "ext4.did";
+// import ext4 = "ai7t5-aibaq-aaaaa-aaaaa-c" as "ext4.did";
+
+let result = call ext4.ls();
+assert result == vec {};
+
+let result = call ext4.write_file("hello.txt", "Hello, World!");
+assert result == null;
+
+let result = call ext4.ls();
+assert result == vec { "hello.txt"; };
+
+let result = call ext4.read_file("hello.txt");
+assert result == "Hello, World!";
+
+let result = call ext4.write_file("hello.txt", "Hello!");
+assert result == null;
+
+let result = call ext4.read_file("hello.txt");
+assert result == "Hello!";
+
+let result = call ext4.write_file("goodbye.txt", "Goodbye!");
+assert result == null;
+
+let result = call ext4.ls();
+assert result == vec { "hello.txt"; "goodbye.txt"; };
+
+let result = call ext4.read_file("goodbye.txt");
+assert result == "Goodbye!";

examples/fatfs/Cargo.toml

@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Paul Young <[email protected]>"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 path = "lib.rs"
 crate-type = ["cdylib", "lib"]