fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-03-16 00:00:49 +00:00
Code Issues Projects Releases Wiki Activity

check that WasiFs could be created

Browse Source
This commit is contained in:
vms 2020-12-03 22:56:54 +03:00
parent 1480154172
commit 5a83aef904
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3004,7 +3004,7 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-wasi-fl" name = "wasmer-wasi-fl"
version = "0.17.0" version = "0.17.1"
dependencies = [ dependencies = [
"bincode", "bincode",
"byteorder", "byteorder",

2
lib/wasi-experimental-io-devices/Cargo.toml
View File

@ -14,7 +14,7 @@ maintenance = { status = "experimental" }
[dependencies] [dependencies]
log = "0.4" log = "0.4"
minifb = "0.13" minifb = "0.13"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.0", path = "../wasi" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1", path = "../wasi" }
wasmer-runtime-core = { version = "0.17.0", package = "wasmer-runtime-core-fl", path = "../runtime-core" } wasmer-runtime-core = { version = "0.17.0", package = "wasmer-runtime-core-fl", path = "../runtime-core" }
ref_thread_local = "0.0" ref_thread_local = "0.0"
serde = "1" serde = "1"

2
lib/wasi/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-wasi-fl" name = "wasmer-wasi-fl"
version = "0.17.0" version = "0.17.1"
description = "Wasmer runtime WASI implementation library" description = "Wasmer runtime WASI implementation library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]

28
lib/wasi/src/lib.rs
View File

@ -57,7 +57,11 @@ pub fn generate_import_object(
envs: Vec<Vec<u8>>, envs: Vec<Vec<u8>>,
preopened_files: Vec<PathBuf>, preopened_files: Vec<PathBuf>,
mapped_dirs: Vec<(String, PathBuf)>, mapped_dirs: Vec<(String, PathBuf)>,
) -> ImportObject { ) -> Result<ImportObject, String> {
// it is just for check that WasiFs could be created
#[allow(deprecated)]
let _ = WasiFs::new(&preopened_files, &mapped_dirs)?;
let state_gen = move || { let state_gen = move || {
// TODO: look into removing all these unnecessary clones // TODO: look into removing all these unnecessary clones
fn state_destructor(data: *mut c_void) { fn state_destructor(data: *mut c_void) {
@ -71,7 +75,8 @@ pub fn generate_import_object(
// this deprecation warning only applies to external callers // this deprecation warning only applies to external callers
#[allow(deprecated)] #[allow(deprecated)]
let state = Box::new(WasiState { let state = Box::new(WasiState {
fs: WasiFs::new(&preopened_files, &mapped_dirs).expect("Could not create WASI FS"), fs: WasiFs::new(&preopened_files, &mapped_dirs)
.expect("WasiFs's been already checked for creation"),
args: args.clone(), args: args.clone(),
envs: envs.clone(), envs: envs.clone(),
}); });
@ -82,7 +87,7 @@ pub fn generate_import_object(
) )
}; };
generate_import_object_snapshot1_inner(state_gen) Ok(generate_import_object_snapshot1_inner(state_gen))
} }
/// Create an [`ImportObject`] with an existing [`WasiState`]. [`WasiState`] /// Create an [`ImportObject`] with an existing [`WasiState`]. [`WasiState`]
@ -124,7 +129,7 @@ pub fn generate_import_object_for_version(
envs: Vec<Vec<u8>>, envs: Vec<Vec<u8>>,
preopened_files: Vec<PathBuf>, preopened_files: Vec<PathBuf>,
mapped_dirs: Vec<(String, PathBuf)>, mapped_dirs: Vec<(String, PathBuf)>,
) -> ImportObject { ) -> Result<ImportObject, String> {
match version { match version {
WasiVersion::Snapshot0 => { WasiVersion::Snapshot0 => {
generate_import_object_snapshot0(args, envs, preopened_files, mapped_dirs) generate_import_object_snapshot0(args, envs, preopened_files, mapped_dirs)
@ -141,7 +146,11 @@ fn generate_import_object_snapshot0(
envs: Vec<Vec<u8>>, envs: Vec<Vec<u8>>,
preopened_files: Vec<PathBuf>, preopened_files: Vec<PathBuf>,
mapped_dirs: Vec<(String, PathBuf)>, mapped_dirs: Vec<(String, PathBuf)>,
) -> ImportObject { ) -> Result<ImportObject, String> {
// it is just for check that WasiFs could be created
#[allow(deprecated)]
let _ = WasiFs::new(&preopened_files, &mapped_dirs)?;
let state_gen = move || { let state_gen = move || {
// TODO: look into removing all these unnecessary clones // TODO: look into removing all these unnecessary clones
fn state_destructor(data: *mut c_void) { fn state_destructor(data: *mut c_void) {
@ -149,14 +158,15 @@ fn generate_import_object_snapshot0(
drop(Box::from_raw(data as *mut WasiState)); drop(Box::from_raw(data as *mut WasiState));
} }
} }
let preopened_files = preopened_files.clone(); // let preopened_files = preopened_files.clone();
let mapped_dirs = mapped_dirs.clone(); // let mapped_dirs = mapped_dirs.clone();
//let wasi_builder = create_wasi_instance(); //let wasi_builder = create_wasi_instance();
// this deprecation warning only applies to external callers // this deprecation warning only applies to external callers
#[allow(deprecated)] #[allow(deprecated)]
let state = Box::new(WasiState { let state = Box::new(WasiState {
fs: WasiFs::new(&preopened_files, &mapped_dirs).expect("Could not create WASI FS"), fs: WasiFs::new(&preopened_files, &mapped_dirs)
.expect("it's been already checked that WasiFs can be created"),
args: args.clone(), args: args.clone(),
envs: envs.clone(), envs: envs.clone(),
}); });
@ -166,7 +176,7 @@ fn generate_import_object_snapshot0(
state_destructor as fn(*mut c_void), state_destructor as fn(*mut c_void),
) )
}; };
generate_import_object_snapshot0_inner(state_gen) Ok(generate_import_object_snapshot0_inner(state_gen))
} }
/// Combines a state generating function with the import list for legacy WASI /// Combines a state generating function with the import list for legacy WASI