T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2641 from bytecodealliance/pch/fix_wasi_ctx_build

Browse Source 
WasiCtx: default to empty/sink stdio files rather than throw
This commit is contained in:
Pat Hickey
2021-02-05 18:39:15 -08:00
committed by GitHub
parent e4827ad779 e4ce04bab4
commit 1fe58fe9a4
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/test-programs/tests/wasm_tests/runtime/cap_std_sync.rs
View File

@@ -1,7 +1,7 @@
use anyhow::Context; use anyhow::Context;
use std::path::Path; use std::path::Path;
use wasi_cap_std_sync::WasiCtxBuilder; use wasi_cap_std_sync::WasiCtxBuilder;
use wasi_common::pipe::{ReadPipe, WritePipe}; use wasi_common::pipe::WritePipe;
use wasmtime::{Linker, Module, Store}; use wasmtime::{Linker, Module, Store};
pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> anyhow::Result<()> { pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> anyhow::Result<()> {
@@ -18,7 +18,6 @@ pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> any
builder = builder builder = builder
.arg(bin_name)? .arg(bin_name)?
.arg(".")? .arg(".")?
.stdin(Box::new(ReadPipe::from(Vec::new())))
.stdout(Box::new(stdout.clone())) .stdout(Box::new(stdout.clone()))
.stderr(Box::new(stderr.clone())); .stderr(Box::new(stderr.clone()));

37
crates/wasi-common/src/ctx.rs
View File

@@ -65,16 +65,19 @@ pub struct WasiCtxBuilder(WasiCtx);
impl WasiCtxBuilder { impl WasiCtxBuilder {
pub fn build(self) -> Result<WasiCtx, Error> { pub fn build(self) -> Result<WasiCtx, Error> {
use crate::file::TableFileExt; use crate::file::TableFileExt;
let t = self.0.table(); // Default to an empty readpipe for stdin:
for (fd, name) in ["stdin", "stdout", "stderr"].iter().enumerate() { if self.0.table().get_file(0).is_err() {
if t.get_file(fd as u32).is_err() { let stdin = crate::pipe::ReadPipe::new(std::io::empty());
return Err(anyhow::anyhow!( self.0.insert_file(0, Box::new(stdin), FileCaps::all());
"Cannot build WasiCtx: Missing required file `{}`", }
name // Default to a sink writepipe for stdout, stderr:
)); for stdio_write in &[1, 2] {
if self.0.table().get_file(*stdio_write).is_err() {
let output_file = crate::pipe::WritePipe::new(std::io::sink());
self.0
.insert_file(*stdio_write, Box::new(output_file), FileCaps::all());
} }
} }
drop(t);
Ok(self.0) Ok(self.0)
} }
@@ -89,29 +92,17 @@ impl WasiCtxBuilder {
} }
pub fn stdin(self, f: Box<dyn WasiFile>) -> Self { pub fn stdin(self, f: Box<dyn WasiFile>) -> Self {
self.0.insert_file( self.0.insert_file(0, f, FileCaps::all());
0,
f,
FileCaps::READ | FileCaps::POLL_READWRITE, // XXX fixme: more rights are ok, but this is read-only
);
self self
} }
pub fn stdout(self, f: Box<dyn WasiFile>) -> Self { pub fn stdout(self, f: Box<dyn WasiFile>) -> Self {
self.0.insert_file( self.0.insert_file(1, f, FileCaps::all());
1,
f,
FileCaps::WRITE | FileCaps::POLL_READWRITE, // XXX fixme: more rights are ok, but this is append only
);
self self
} }
pub fn stderr(self, f: Box<dyn WasiFile>) -> Self { pub fn stderr(self, f: Box<dyn WasiFile>) -> Self {
self.0.insert_file( self.0.insert_file(2, f, FileCaps::all());
2,
f,
FileCaps::WRITE | FileCaps::POLL_READWRITE, // XXX fixme: more rights are ok, but this is append only
);
self self
} }