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

Fix nondeterminism in the preopen order.

Browse Source 
We iterate over the preopens to present them to the WASI program, so
storing them in a `HashMap` means this order is nondeterministic. Switch
to a `Vec` of tuples instead. This means we don't eliminate duplicates,
but they should be rare.
This commit is contained in:
Dan Gohman
2019-10-18 08:44:17 -07:00
committed by Jakub Konka
parent 4120d3b44f
commit ef010b44b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ctx.rs
View File

@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
/// A builder allowing customizable construction of `WasiCtx` instances. /// A builder allowing customizable construction of `WasiCtx` instances.
pub struct WasiCtxBuilder { pub struct WasiCtxBuilder {
fds: HashMap<host::__wasi_fd_t, FdEntry>, fds: HashMap<host::__wasi_fd_t, FdEntry>,
preopens: HashMap<PathBuf, File>, preopens: Vec<(PathBuf, File)>,
args: Vec<CString>, args: Vec<CString>,
env: HashMap<CString, CString>, env: HashMap<CString, CString>,
} }
@@ -21,7 +21,7 @@ impl WasiCtxBuilder {
pub fn new() -> Result<Self> { pub fn new() -> Result<Self> {
let mut builder = Self { let mut builder = Self {
fds: HashMap::new(), fds: HashMap::new(),
preopens: HashMap::new(), preopens: Vec::new(),
args: vec![], args: vec![],
env: HashMap::new(), env: HashMap::new(),
}; };
@@ -98,7 +98,7 @@ impl WasiCtxBuilder {
/// Add a preopened directory. /// Add a preopened directory.
pub fn preopened_dir<P: AsRef<Path>>(mut self, dir: File, guest_path: P) -> Self { pub fn preopened_dir<P: AsRef<Path>>(mut self, dir: File, guest_path: P) -> Self {
self.preopens.insert(guest_path.as_ref().to_owned(), dir); self.preopens.push((guest_path.as_ref().to_owned(), dir));
self self
} }