Skip to content

Don't decode the incoming events to poll_oneoff. #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 2 commits into from
Apr 30, 2019
Merged

Don't decode the incoming events to poll_oneoff. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f2a74
Don't decode the incoming events to poll_oneoff.
sunfishcode Apr 23, 2019
151aead
Merge branch 'master' into poll_oneoff
sunfishcode Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions wasmtime-wasi/src/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::instantiate::WASIState;
use cranelift_codegen::ir::types::{Type, I32, I64};
use host;
use host_impls;
use std::{ptr, slice, str};
use std::{mem, ptr, slice, str};
use translate::*;
use wasm32;
use wasmtime_runtime::VMContext;
Expand Down Expand Up @@ -1344,10 +1344,12 @@ syscalls! {
Ok(in_) => in_,
Err(e) => return return_encoded_errno(e),
};
let mut host_out = match decode_event_slice(vmctx, out, nsubscriptions) {
Ok(out) => out,
let (out, out_len) = match decode_event_slice(vmctx, out, nsubscriptions) {
Ok((out, out_len)) => (out, out_len),
Err(e) => return return_encoded_errno(e),
};
let mut host_out = Vec::new();
host_out.resize(out_len, mem::zeroed());
let mut host_nevents = 0;
if let Err(e) = decode_usize_byref(vmctx, nevents) {
return return_encoded_errno(e);
Expand All @@ -1366,13 +1368,14 @@ syscalls! {
trace!(" | *nevents={:?}", host_nevents);
encode_usize_byref(vmctx, nevents, host_nevents);

host_out.truncate(host_nevents);
if log_enabled!(log::Level::Trace) {
for (index, _event) in host_out.iter().enumerate() {
// TODO: Format the output for tracing.
trace!(" | *out[{}]=...", index);
}
}
encode_event_slice(vmctx, out, host_out);
encode_event_slice(out, host_out);

return_encoded_errno(e)
}
Expand Down
51 changes: 5 additions & 46 deletions wasmtime-wasi/src/translate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@ pub fn encode_filesize(filesize: host::__wasi_filesize_t) -> wasm32::__wasi_file
filesize
}

pub fn decode_eventrwflags(
eventrwflags: wasm32::__wasi_eventrwflags_t,
) -> host::__wasi_eventrwflags_t {
eventrwflags
}

pub fn encode_eventrwflags(
eventrwflags: host::__wasi_eventrwflags_t,
) -> wasm32::__wasi_eventrwflags_t {
Expand Down Expand Up @@ -365,31 +359,6 @@ pub unsafe fn decode_subscription_slice(
.collect()
}

pub fn decode_event(
guest_event: wasm32::__wasi_event_t,
) -> Result<host::__wasi_event_t, host::__wasi_errno_t> {
let mut host_event = host::__wasi_event_t {
userdata: decode_userdata(guest_event.userdata),
error: decode_errno(guest_event.error),
type_: decode_eventtype(guest_event.type_),
u: unsafe { zeroed() },
};

match guest_event.type_ {
wasm32::__WASI_EVENTTYPE_CLOCK => {}
wasm32::__WASI_EVENTTYPE_FD_READ | wasm32::__WASI_EVENTTYPE_FD_WRITE => unsafe {
host_event.u.fd_readwrite =
host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
nbytes: decode_filesize(guest_event.u.fd_readwrite.nbytes),
flags: decode_eventrwflags(guest_event.u.fd_readwrite.flags),
}
},
_ => return Err(host::__WASI_EINVAL as host::__wasi_errno_t),
};

Ok(host_event)
}

pub fn encode_event(host_event: host::__wasi_event_t) -> wasm32::__wasi_event_t {
let mut guest_event = wasm32::__wasi_event_t {
userdata: encode_userdata(host_event.userdata),
Expand Down Expand Up @@ -419,25 +388,19 @@ pub unsafe fn decode_event_slice(
vmctx: &mut VMContext,
ptr: wasm32::uintptr_t,
len: wasm32::size_t,
) -> Result<Vec<host::__wasi_event_t>, host::__wasi_errno_t> {
let slice = decode_slice_of::<wasm32::__wasi_event_t>(vmctx, ptr, len)?;
let slice = slice::from_raw_parts(slice.0, slice.1);
slice.iter().map(|event| decode_event(*event)).collect()
) -> Result<(*mut wasm32::__wasi_event_t, usize), host::__wasi_errno_t> {
decode_slice_of::<wasm32::__wasi_event_t>(vmctx, ptr, len)
}

pub unsafe fn encode_event_slice(
vmctx: &mut VMContext,
ptr: wasm32::uintptr_t,
ptr: *mut wasm32::__wasi_event_t,
host_vec: Vec<host::__wasi_event_t>,
) {
for (i, host) in host_vec.iter().enumerate() {
let guest = encode_event(*host);

encode_pointee(
vmctx,
ptr + (i * size_of::<wasm32::__wasi_event_t>()) as u32,
guest,
);
ptr.add(i * size_of::<wasm32::__wasi_event_t>())
.write(guest);
}
}

Expand Down Expand Up @@ -604,10 +567,6 @@ pub unsafe fn encode_filestat_byref(
encode_pointee::<wasm32::__wasi_filestat_t>(vmctx, filestat_ptr, wasm32_filestat)
}

pub fn decode_errno(errno: wasm32::__wasi_errno_t) -> host::__wasi_errno_t {
errno
}

pub fn encode_errno(e: host::__wasi_errno_t) -> wasm32::__wasi_errno_t {
assert!(e <= wasm32::__WASI_ENOTCAPABLE);
e
Expand Down