Pipe together wasmtime subprocesses instead of managing the buffer

Author: elliottt

crates/wasi/src/preview2/stdio.rs

@@ -36,16 +36,6 @@ pub trait StdinStream: Send + Sync {
     fn isatty(&self) -> bool;
 }
 
-impl<T: StdinStream + ?Sized> StdinStream for Box<T> {
-    fn stream(&self) -> Box<dyn HostInputStream> {
-        self.as_ref().stream()
-    }
-
-    fn isatty(&self) -> bool {
-        self.as_ref().isatty()
-    }
-}
-
 impl StdinStream for pipe::MemoryInputPipe {
     fn stream(&self) -> Box<dyn HostInputStream> {
         Box::new(self.clone())
@@ -89,16 +79,6 @@ pub trait StdoutStream: Send + Sync {
     fn isatty(&self) -> bool;
 }
 
-impl<T: StdoutStream + ?Sized> StdoutStream for Box<T> {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        self.as_ref().stream()
-    }
-
-    fn isatty(&self) -> bool {
-        self.as_ref().isatty()
-    }
-}
-
 impl StdoutStream for pipe::MemoryOutputPipe {
     fn stream(&self) -> Box<dyn HostOutputStream> {
         Box::new(self.clone())

crates/wasi/tests/all/main.rs

@@ -7,7 +7,7 @@ use wasmtime::{
 use wasmtime_wasi::preview2::{
     pipe::MemoryOutputPipe,
     preview1::{WasiPreview1Adapter, WasiPreview1View},
-    DirPerms, FilePerms, StdinStream, StdoutStream, WasiCtx, WasiCtxBuilder, WasiView,
+    DirPerms, FilePerms, WasiCtx, WasiCtxBuilder, WasiView,
 };
 
 struct Ctx {
@@ -48,98 +48,40 @@ fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
     Ok(tempdir)
 }
 
-struct StoreBuilder {
-    builder: WasiCtxBuilder,
-    inherit_stdio: bool,
-    workspace: TempDir,
-    stdin: Option<Box<dyn StdinStream>>,
-    stdout: Option<Box<dyn StdoutStream>>,
-    stderr: Option<Box<dyn StdoutStream>>,
-}
-
-impl StoreBuilder {
-    fn new(name: &str) -> Result<Self> {
-        let mut builder = WasiCtxBuilder::new();
-
-        builder
-            .args(&[name, "."])
-            .inherit_network()
-            .allow_ip_name_lookup(true);
-
-        let workspace = prepare_workspace(name)?;
-
-        Ok(Self {
-            builder,
-            inherit_stdio: false,
-            workspace,
-            stdin: None,
-            stdout: None,
-            stderr: None,
-        })
-    }
-
-    fn stdout(&mut self, stdout: Box<dyn StdoutStream>) -> &mut Self {
-        self.stdout.replace(stdout);
-        self
+fn store(engine: &Engine, name: &str, inherit_stdio: bool) -> Result<(Store<Ctx>, TempDir)> {
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let workspace = prepare_workspace(name)?;
+
+    // Create our wasi context.
+    let mut builder = WasiCtxBuilder::new();
+    if inherit_stdio {
+        builder.inherit_stdio();
+    } else {
+        builder.stdout(stdout.clone()).stderr(stderr.clone());
     }
 
-    fn stdin(&mut self, stdin: Box<dyn StdinStream>) -> &mut Self {
-        self.stdin.replace(stdin);
-        self
+    builder
+        .args(&[name, "."])
+        .inherit_network()
+        .allow_ip_name_lookup(true);
+    println!("preopen: {:?}", workspace);
+    let preopen_dir =
+        cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
+    builder.preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
+    for (var, val) in test_programs_artifacts::wasi_tests_environment() {
+        builder.env(var, val);
     }
 
-    fn build(mut self, engine: &Engine) -> Result<(Store<Ctx>, TempDir)> {
-        let stdout = MemoryOutputPipe::new(4096);
-        let stderr = MemoryOutputPipe::new(4096);
-
-        // Create our wasi context.
-        if self.inherit_stdio {
-            self.builder.inherit_stdio();
-        } else {
-            if let Some(stdin) = self.stdin {
-                self.builder.stdin(stdin);
-            }
-
-            if let Some(stdout) = self.stdout {
-                self.builder.stdout(stdout);
-            } else {
-                self.builder.stdout(stdout.clone());
-            }
-
-            if let Some(stderr) = self.stderr {
-                self.builder.stderr(stderr);
-            } else {
-                self.builder.stderr(stderr.clone());
-            }
-        }
-
-        println!("preopen: {:?}", self.workspace);
-        let preopen_dir = cap_std::fs::Dir::open_ambient_dir(
-            self.workspace.path(),
-            cap_std::ambient_authority(),
-        )?;
-        self.builder
-            .preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
-        for (var, val) in test_programs_artifacts::wasi_tests_environment() {
-            self.builder.env(var, val);
-        }
-
-        let ctx = Ctx {
-            table: ResourceTable::new(),
-            wasi: self.builder.build(),
-            stderr,
-            stdout,
-            adapter: WasiPreview1Adapter::new(),
-        };
-
-        Ok((Store::new(&engine, ctx), self.workspace))
-    }
-}
+    let ctx = Ctx {
+        table: ResourceTable::new(),
+        wasi: builder.build(),
+        stderr,
+        stdout,
+        adapter: WasiPreview1Adapter::new(),
+    };
 
-fn store(engine: &Engine, name: &str, inherit_stdio: bool) -> Result<(Store<Ctx>, TempDir)> {
-    let mut builder = StoreBuilder::new(name)?;
-    builder.inherit_stdio = inherit_stdio;
-    builder.build(engine)
+    Ok((Store::new(&engine, ctx), workspace))
 }
 
 impl Drop for Ctx {
@@ -166,6 +108,5 @@ macro_rules! assert_test_exists {
 
 mod api;
 mod async_;
-mod piped;
 mod preview1;
 mod sync;