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

Update poll_oneoff's signature

Browse Source 
This PR updates `wasmtime_wasi` crate by adjusting `poll_oneoff`'s
signature to that introduced in `wasi_common` in
CraneStation/wasi-common#137. This change is required in order to
fix #440.
This commit is contained in:
Jakub Konka
2019-10-23 21:24:54 +02:00
parent a7fa6bdb31
commit 875eea6052
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -25,7 +25,7 @@ wasmtime-obj = { path = "wasmtime-obj" }
wasmtime-wast = { path = "wasmtime-wast" } wasmtime-wast = { path = "wasmtime-wast" }
wasmtime-wasi = { path = "wasmtime-wasi" } wasmtime-wasi = { path = "wasmtime-wasi" }
wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true } wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true }
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
docopt = "1.0.1" docopt = "1.0.1"
serde = { "version" = "1.0.94", features = ["derive"] } serde = { "version" = "1.0.94", features = ["derive"] }
faerie = "0.11.0" faerie = "0.11.0"

2
wasmtime-api/Cargo.toml
View File

@@ -35,7 +35,7 @@ core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "w
[dev-dependencies] [dev-dependencies]
# for wasmtime.rs # for wasmtime.rs
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
docopt = "1.0.1" docopt = "1.0.1"
serde = { "version" = "1.0.94", features = ["derive"] } serde = { "version" = "1.0.94", features = ["derive"] }
pretty_env_logger = "0.3.0" pretty_env_logger = "0.3.0"

2
wasmtime-wasi/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-runtime = { path = "../wasmtime-runtime" }
wasmtime-environ = { path = "../wasmtime-environ" } wasmtime-environ = { path = "../wasmtime-environ" }
wasmtime-jit = { path = "../wasmtime-jit" } wasmtime-jit = { path = "../wasmtime-jit" }
wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"} wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
cranelift-codegen = { version = "0.46.1", features = ["enable-serde"] } cranelift-codegen = { version = "0.46.1", features = ["enable-serde"] }
cranelift-entity = { version = "0.46.1", features = ["enable-serde"] } cranelift-entity = { version = "0.46.1", features = ["enable-serde"] }
cranelift-wasm = { version = "0.46.1", features = ["enable-serde"] } cranelift-wasm = { version = "0.46.1", features = ["enable-serde"] }

3
wasmtime-wasi/src/syscalls.rs
View File

@@ -874,8 +874,9 @@ syscalls! {
nsubscriptions, nsubscriptions,
nevents, nevents,
); );
let wasi_ctx = ok_or_errno!(get_wasi_ctx(&mut *vmctx));
let memory = ok_or_errno!(get_memory(&mut *vmctx)); let memory = ok_or_errno!(get_memory(&mut *vmctx));
hostcalls::poll_oneoff(memory, in_, out, nsubscriptions, nevents) hostcalls::poll_oneoff(wasi_ctx, memory, in_, out, nsubscriptions, nevents)
} }
pub unsafe extern "C" fn proc_exit(_vmctx: *mut VMContext, rval: u32,) -> () { pub unsafe extern "C" fn proc_exit(_vmctx: *mut VMContext, rval: u32,) -> () {