Land preview2-prototyping's Wasi Preview 2 implementation into wasmtime

Cargo.toml

@@ -71,7 +71,7 @@ wasmtime-component-util = { workspace = true }
 component-macro-test = { path = "crates/misc/component-macro-test" }
 component-test-util = { workspace = true }
 bstr = "0.2.17"
-libc = "0.2.60"
+libc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 walkdir = { workspace = true }
@@ -99,6 +99,8 @@ members = [
   "crates/jit-icache-coherence",
   "crates/test-programs/wasi-tests",
   "crates/test-programs/wasi-http-tests",
+  "crates/test-programs/command-tests",
+  "crates/test-programs/reactor-tests",
   "crates/wasi-preview1-component-adapter",
   "crates/wasi-preview1-component-adapter/verify",
   "crates/winch",
@@ -187,8 +189,12 @@ regalloc2 = "0.8.1"
 
 # cap-std family:
 target-lexicon = { version = "0.12.3", default-features = false, features = ["std"] }
-cap-std = "1.0.0"
-cap-rand = "1.0.0"
+cap-std = "1.0.12"
+cap-rand = "1.0.12"
+cap-fs-ext = "1.0.12"
+cap-time-ext = "1.0.0"
+fs-set-times = "0.19.0"
+system-interface = { version = "0.25.1", features = ["cap_std_impls"] }
 io-lifetimes = { version = "1.0.0", default-features = false }
 rustix = "0.37.13"
 
@@ -234,6 +240,7 @@ walkdir = "2.3.3"
 cfg-if = "1.0"
 tempfile = "3.1.0"
 filecheck = "0.5.0"
+libc = "0.2.60"
 
 [features]
 default = [

ci/run-tests.sh

@@ -8,4 +8,6 @@ cargo test \
     --exclude wasi-crypto \
     --exclude wasi-tests \
     --exclude wasi-http-tests \
+    --exclude command-tests \
+    --exclude reactor-tests \
     $@

crates/test-programs/Cargo.toml

@@ -26,6 +26,7 @@ wasi-common = { workspace = true }
 wasi-cap-std-sync = { workspace = true }
 wasmtime-wasi = { workspace = true, features = ["tokio"] }
 cap-std = { workspace = true }
+cap-rand = { workspace = true }
 tokio = { version = "1.8.0", features = ["net", "rt-multi-thread", "macros"] }
 
 wasmtime-wasi-http = { workspace = true }

crates/test-programs/build.rs

@@ -15,9 +15,7 @@ fn main() {
 fn build_and_generate_tests() {
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
 
-    // Not needed yet, but will be shortly:
-    //let reactor_adapter = build_adapter("reactor", &[]);
-
+    let reactor_adapter = build_adapter(&out_dir, "reactor", &[]);
     let command_adapter = build_adapter(
         &out_dir,
         "command",
@@ -26,6 +24,8 @@ fn build_and_generate_tests() {
 
     println!("cargo:rerun-if-changed=./wasi-tests");
     println!("cargo:rerun-if-changed=./wasi-http-tests");
+    println!("cargo:rerun-if-changed=./command-tests");
+    println!("cargo:rerun-if-changed=./reactor-tests");
 
     // Build the test programs:
     let mut cmd = Command::new("rustup");
@@ -36,6 +36,8 @@ fn build_and_generate_tests() {
         .arg("--target=wasm32-wasi")
         .arg("--package=wasi-tests")
         .arg("--package=wasi-http-tests")
+        .arg("--package=command-tests")
+        .arg("--package=reactor-tests")
         .env("CARGO_TARGET_DIR", &out_dir)
         .env("CARGO_PROFILE_DEV_DEBUG", "1")
         .env_remove("CARGO_ENCODED_RUSTFLAGS");
@@ -48,8 +50,13 @@ fn build_and_generate_tests() {
     components_rs(&meta, "wasi-tests", "bin", &command_adapter, &out_dir);
 
     modules_rs(&meta, "wasi-http-tests", "bin", &out_dir);
-    // FIXME Unsure why this is broken at the moment:
+    // FIXME this is broken at the moment because guest bindgen is embedding the proxy world type,
+    // so wit-component expects the module to contain the proxy's exports. we need a different
+    // world to pass guest bindgen that is just "a command that also can do outbound http"
     //components_rs(&meta, "wasi-http-tests", "bin", &command_adapter, &out_dir);
+
+    components_rs(&meta, "command-tests", "bin", &command_adapter, &out_dir);
+    components_rs(&meta, "reactor-tests", "cdylib", &reactor_adapter, &out_dir);
 }
 
 // Creates an `${out_dir}/${package}_modules.rs` file that exposes a `get_module(&str) -> Module`,
@@ -170,7 +177,7 @@ fn components_rs(
         "
         );
         cases += &format!("{stem:?} => {global}.clone(),\n");
-        uses += &format!("use self::{stem} as _;\n");
+        uses += &format!("#[allow(unused_imports)] use self::{stem} as _;\n");
     }
 
     std::fs::write(

crates/test-programs/command-tests/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "command-tests"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = { workspace = true }
+getrandom = "0.2.8"
+wit-bindgen = { workspace = true, default-features = true }
+
+# FIXME: building cap-std and rustix currently requires a nightly rust, so we
+# are not including it in the test suite.
+# The poll_stdin and file_dir_sync tests contain commented-out uses of these
+# crates. They should be re-enabled once these crates can build for
+# wasm32-wasi on stable rust.
+# rustix = { workspace = true }
+# cap-std = { workspace = true }

crates/test-programs/command-tests/src/bin/args.rs

@@ -0,0 +1,7 @@
+fn main() {
+    let args = std::env::args().collect::<Vec<_>>();
+    assert_eq!(
+        args,
+        ["hello", "this", "", "is an argument", "with 🚩 emoji"]
+    );
+}

crates/test-programs/command-tests/src/bin/default_clocks.rs

@@ -0,0 +1,10 @@
+fn main() {
+    let a = std::time::Instant::now();
+    let b = std::time::Instant::now();
+    let _ = b.checked_duration_since(a).unwrap();
+
+    let c = std::time::SystemTime::now();
+    let d = std::time::SystemTime::now();
+    let _ = c.duration_since(std::time::UNIX_EPOCH).unwrap();
+    let _ = d.duration_since(std::time::UNIX_EPOCH).unwrap();
+}

crates/test-programs/command-tests/src/bin/directory_list.rs

@@ -0,0 +1,30 @@
+use anyhow::{Context, Error};
+use std::{collections::HashSet, fs, path::PathBuf};
+
+fn main() -> Result<(), Error> {
+    assert_eq!(
+        ["/foo.txt", "/bar.txt", "/baz.txt", "/sub"]
+            .into_iter()
+            .map(PathBuf::from)
+            .collect::<HashSet<_>>(),
+        fs::read_dir("/")
+            .context("read_dir /")?
+            .map(|r| r.map(|d| d.path()))
+            .collect::<Result<_, _>>()
+            .context("elem in /")?
+    );
+
+    assert_eq!(
+        ["/sub/wow.txt", "/sub/yay.txt"]
+            .into_iter()
+            .map(PathBuf::from)
+            .collect::<HashSet<_>>(),
+        fs::read_dir("/sub")
+            .context("read_dir /sub")?
+            .map(|r| r.map(|d| d.path()))
+            .collect::<Result<_, _>>()
+            .context("elem in /sub")?
+    );
+
+    Ok(())
+}

crates/test-programs/command-tests/src/bin/env.rs

@@ -0,0 +1,10 @@
+fn main() {
+    let vars = std::env::vars().collect::<std::collections::HashMap<_, _>>();
+    assert_eq!(
+        vars,
+        [("frabjous", "day"), ("callooh", "callay")]
+            .into_iter()
+            .map(|(k, v)| (k.to_owned(), v.to_owned()))
+            .collect()
+    );
+}

crates/test-programs/command-tests/src/bin/exit_default.rs

@@ -0,0 +1 @@
+fn main() {}

crates/test-programs/command-tests/src/bin/exit_failure.rs

@@ -0,0 +1,3 @@
+fn main() {
+    std::process::exit(1)
+}

crates/test-programs/command-tests/src/bin/exit_panic.rs

@@ -0,0 +1,3 @@
+fn main() {
+    panic!("Curiouser and curiouser!")
+}

crates/test-programs/command-tests/src/bin/exit_success.rs

@@ -0,0 +1,3 @@
+fn main() {
+    std::process::exit(0)
+}

crates/test-programs/command-tests/src/bin/export_cabi_realloc.rs

@@ -0,0 +1,34 @@
+//! `wit-component` handles modules which export `cabi_realloc` in a special way, using it instead of `memory.grow`
+//! to allocate the adapter stack, hence this test.
+
+#[export_name = "cabi_realloc"]
+#[no_mangle]
+unsafe extern "C" fn cabi_realloc(
+    old_ptr: *mut u8,
+    old_len: usize,
+    align: usize,
+    new_len: usize,
+) -> *mut u8 {
+    use std::alloc::{self, Layout};
+
+    let layout;
+    let ptr = if old_len == 0 {
+        if new_len == 0 {
+            return align as *mut u8;
+        }
+        layout = Layout::from_size_align_unchecked(new_len, align);
+        alloc::alloc(layout)
+    } else {
+        debug_assert_ne!(new_len, 0, "non-zero old_len requires non-zero new_len!");
+        layout = Layout::from_size_align_unchecked(old_len, align);
+        alloc::realloc(old_ptr, layout, new_len)
+    };
+    if ptr.is_null() {
+        core::arch::wasm32::unreachable();
+    }
+    return ptr;
+}
+
+fn main() {
+    println!("hello, world");
+}

crates/test-programs/command-tests/src/bin/file_append.rs

@@ -0,0 +1,17 @@
+use std::{
+    error::Error,
+    fs::OpenOptions,
+    io::{Seek, SeekFrom, Write},
+};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let mut file = OpenOptions::new().append(true).open("bar.txt")?;
+
+    file.write_all(b"Did gyre and gimble in the wabe;\n")
+        .unwrap();
+    file.seek(SeekFrom::Start(0)).unwrap();
+    file.write_all(b"All mimsy were the borogoves,\n").unwrap();
+    file.write_all(b"And the mome raths outgrabe.\n").unwrap();
+
+    Ok(())
+}

crates/test-programs/command-tests/src/bin/file_dir_sync.rs

@@ -0,0 +1,14 @@
+fn main() -> std::io::Result<()> {
+    let file = std::fs::File::open("bar.txt")?;
+    file.sync_all()?;
+    file.sync_data()?;
+
+    /*
+     * TODO: Support opening directories with `File::open` on Windows.
+    let dir = cap_std::fs::Dir::open(".")?;
+    dir.sync_all()?;
+    dir.sync_data()?;
+    */
+
+    Ok(())
+}