* Rewrite FdEntry reusing as much libstd as possible
* Use the new FdEntry, FdObject, Descriptor struct in *nix impl
* Adapt Windows impl
* Remove unnecessary check in fd_read
Check `host_nread == 0` caused premature FdEntry closure and removal
which ultimately was resulting in an attempt at "double closing" of
the same file descriptor at the end of the Wasm program:
...
fd_close(fd=4)
-> errno=WASI_ESUCCESS
fd_close(fd=4)
-> errno=WASI_EBADF
* Use libstd vectored IO
* Use std:🧵:yield_now to implement sched_yield
* Add logging to integration tests
* Add preliminary support for host-specific errors
* Operate on std::fs::File in path_get on *nix
* Add cross-platform RawString type encapsulating OsStrExt
* Fix Windows build
* Update Travis and README to Rust v1.36
* Remove unused winx::handle::close helper
* Refactor Descriptor into raw handles/fds
* Strip readlinkat in prep for path_get host-independent
* Strip openat in prep for path_get host-independent
* Move ManuallyDrop up one level from Descriptor to FdObject
* Make (c)iovec host fns unsafe
* Swap unwraps/expects for Results in fdentry_impl on nix
* Rewrite fd_pread/write and implement for Win
* Use File::sync_all to impl fd_sync
* Use File::sync_data to impl fd_datasync
* Rewind file cursor after fd_p{read, write} on Windows
* Add fd_p{read, write} tests
* Handle errors instead of panicking in path_get
* Use File::set_len to impl fd_allocate
* Add test for fd_allocate
* Replace all panics with Results
* Document the point of RawString
280 lines
11 KiB
Rust
280 lines
11 KiB
Rust
#![allow(non_camel_case_types)]
|
|
#![allow(unused_unsafe)]
|
|
use crate::memory::*;
|
|
use crate::sys::host_impl;
|
|
use crate::{host, wasm32};
|
|
|
|
use nix::convert_ioctl_res;
|
|
use nix::libc::{self, c_int};
|
|
use std::cmp;
|
|
use std::time::SystemTime;
|
|
|
|
pub(crate) fn clock_res_get(
|
|
clock_id: host::__wasi_clockid_t,
|
|
) -> Result<host::__wasi_timestamp_t, host::__wasi_errno_t> {
|
|
// convert the supported clocks to the libc types, or return EINVAL
|
|
let clock_id = match clock_id {
|
|
host::__WASI_CLOCK_REALTIME => libc::CLOCK_REALTIME,
|
|
host::__WASI_CLOCK_MONOTONIC => libc::CLOCK_MONOTONIC,
|
|
host::__WASI_CLOCK_PROCESS_CPUTIME_ID => libc::CLOCK_PROCESS_CPUTIME_ID,
|
|
host::__WASI_CLOCK_THREAD_CPUTIME_ID => libc::CLOCK_THREAD_CPUTIME_ID,
|
|
_ => return Err(host::__WASI_EINVAL),
|
|
};
|
|
|
|
// no `nix` wrapper for clock_getres, so we do it ourselves
|
|
let mut timespec = unsafe { std::mem::uninitialized::<libc::timespec>() };
|
|
let res = unsafe { libc::clock_getres(clock_id, &mut timespec as *mut libc::timespec) };
|
|
if res != 0 {
|
|
return Err(host_impl::errno_from_nix(nix::errno::Errno::last()));
|
|
}
|
|
|
|
// convert to nanoseconds, returning EOVERFLOW in case of overflow;
|
|
// this is freelancing a bit from the spec but seems like it'll
|
|
// be an unusual situation to hit
|
|
(timespec.tv_sec as host::__wasi_timestamp_t)
|
|
.checked_mul(1_000_000_000)
|
|
.and_then(|sec_ns| sec_ns.checked_add(timespec.tv_nsec as host::__wasi_timestamp_t))
|
|
.map_or(Err(host::__WASI_EOVERFLOW), |resolution| {
|
|
// a supported clock can never return zero; this case will probably never get hit, but
|
|
// make sure we follow the spec
|
|
if resolution == 0 {
|
|
Err(host::__WASI_EINVAL)
|
|
} else {
|
|
Ok(resolution)
|
|
}
|
|
})
|
|
}
|
|
|
|
pub(crate) fn clock_time_get(
|
|
clock_id: host::__wasi_clockid_t,
|
|
) -> Result<host::__wasi_timestamp_t, host::__wasi_errno_t> {
|
|
// convert the supported clocks to the libc types, or return EINVAL
|
|
let clock_id = match clock_id {
|
|
host::__WASI_CLOCK_REALTIME => libc::CLOCK_REALTIME,
|
|
host::__WASI_CLOCK_MONOTONIC => libc::CLOCK_MONOTONIC,
|
|
host::__WASI_CLOCK_PROCESS_CPUTIME_ID => libc::CLOCK_PROCESS_CPUTIME_ID,
|
|
host::__WASI_CLOCK_THREAD_CPUTIME_ID => libc::CLOCK_THREAD_CPUTIME_ID,
|
|
_ => return Err(host::__WASI_EINVAL),
|
|
};
|
|
|
|
// no `nix` wrapper for clock_getres, so we do it ourselves
|
|
let mut timespec = unsafe { std::mem::uninitialized::<libc::timespec>() };
|
|
let res = unsafe { libc::clock_gettime(clock_id, &mut timespec as *mut libc::timespec) };
|
|
if res != 0 {
|
|
return Err(host_impl::errno_from_nix(nix::errno::Errno::last()));
|
|
}
|
|
|
|
// convert to nanoseconds, returning EOVERFLOW in case of overflow; this is freelancing a bit
|
|
// from the spec but seems like it'll be an unusual situation to hit
|
|
(timespec.tv_sec as host::__wasi_timestamp_t)
|
|
.checked_mul(1_000_000_000)
|
|
.and_then(|sec_ns| sec_ns.checked_add(timespec.tv_nsec as host::__wasi_timestamp_t))
|
|
.map_or(Err(host::__WASI_EOVERFLOW), |time| Ok(time))
|
|
}
|
|
|
|
pub(crate) fn poll_oneoff(
|
|
input: Vec<Result<host::__wasi_subscription_t, host::__wasi_errno_t>>,
|
|
output_slice: &mut [wasm32::__wasi_event_t],
|
|
) -> Result<wasm32::size_t, host::__wasi_errno_t> {
|
|
let timeout = input
|
|
.iter()
|
|
.filter_map(|event| match event {
|
|
Ok(event) if event.type_ == wasm32::__WASI_EVENTTYPE_CLOCK => Some(ClockEventData {
|
|
delay: wasi_clock_to_relative_ns_delay(unsafe { event.u.clock }).ok()? / 1_000_000,
|
|
userdata: event.userdata,
|
|
}),
|
|
_ => None,
|
|
})
|
|
.min_by_key(|event| event.delay);
|
|
|
|
let fd_events: Vec<_> = input
|
|
.iter()
|
|
.filter_map(|event| match event {
|
|
Ok(event)
|
|
if event.type_ == wasm32::__WASI_EVENTTYPE_FD_READ
|
|
|| event.type_ == wasm32::__WASI_EVENTTYPE_FD_WRITE =>
|
|
{
|
|
Some(FdEventData {
|
|
fd: unsafe { event.u.fd_readwrite.fd } as c_int,
|
|
type_: event.type_,
|
|
userdata: event.userdata,
|
|
})
|
|
}
|
|
_ => None,
|
|
})
|
|
.collect();
|
|
if fd_events.is_empty() && timeout.is_none() {
|
|
return Ok(0);
|
|
}
|
|
let mut poll_fds: Vec<_> = fd_events
|
|
.iter()
|
|
.map(|event| {
|
|
let mut flags = nix::poll::EventFlags::empty();
|
|
match event.type_ {
|
|
wasm32::__WASI_EVENTTYPE_FD_READ => flags.insert(nix::poll::EventFlags::POLLIN),
|
|
wasm32::__WASI_EVENTTYPE_FD_WRITE => flags.insert(nix::poll::EventFlags::POLLOUT),
|
|
// An event on a file descriptor can currently only be of type FD_READ or FD_WRITE
|
|
// Nothing else has been defined in the specification, and these are also the only two
|
|
// events we filtered before. If we get something else here, the code has a serious bug.
|
|
_ => unreachable!(),
|
|
};
|
|
nix::poll::PollFd::new(event.fd, flags)
|
|
})
|
|
.collect();
|
|
let timeout = timeout.map(|ClockEventData { delay, userdata }| ClockEventData {
|
|
delay: cmp::min(delay, c_int::max_value() as u128),
|
|
userdata,
|
|
});
|
|
let poll_timeout = timeout.map_or(-1, |timeout| timeout.delay as c_int);
|
|
let ready = loop {
|
|
match nix::poll::poll(&mut poll_fds, poll_timeout) {
|
|
Err(_) => {
|
|
if nix::errno::Errno::last() == nix::errno::Errno::EINTR {
|
|
continue;
|
|
}
|
|
return Err(host_impl::errno_from_nix(nix::errno::Errno::last()));
|
|
}
|
|
Ok(ready) => break ready as usize,
|
|
}
|
|
};
|
|
let events_count = if ready == 0 {
|
|
poll_oneoff_handle_timeout_event(output_slice, timeout)
|
|
} else {
|
|
let events = fd_events.iter().zip(poll_fds.iter()).take(ready);
|
|
poll_oneoff_handle_fd_event(output_slice, events)
|
|
};
|
|
|
|
Ok(events_count)
|
|
}
|
|
|
|
// define the `fionread()` function, equivalent to `ioctl(fd, FIONREAD, *bytes)`
|
|
nix::ioctl_read_bad!(fionread, nix::libc::FIONREAD, c_int);
|
|
|
|
fn wasi_clock_to_relative_ns_delay(
|
|
wasi_clock: host::__wasi_subscription_t___wasi_subscription_u___wasi_subscription_u_clock_t,
|
|
) -> Result<u128, host::__wasi_errno_t> {
|
|
if wasi_clock.flags != wasm32::__WASI_SUBSCRIPTION_CLOCK_ABSTIME {
|
|
return Ok(wasi_clock.timeout as u128);
|
|
}
|
|
let now: u128 = SystemTime::now()
|
|
.duration_since(SystemTime::UNIX_EPOCH)
|
|
.map_err(|_| host::__WASI_ENOTCAPABLE)?
|
|
.as_nanos();
|
|
let deadline = wasi_clock.timeout as u128;
|
|
Ok(deadline.saturating_sub(now))
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
struct ClockEventData {
|
|
delay: u128,
|
|
userdata: host::__wasi_userdata_t,
|
|
}
|
|
#[derive(Debug, Copy, Clone)]
|
|
struct FdEventData {
|
|
fd: c_int,
|
|
type_: host::__wasi_eventtype_t,
|
|
userdata: host::__wasi_userdata_t,
|
|
}
|
|
|
|
fn poll_oneoff_handle_timeout_event(
|
|
output_slice: &mut [wasm32::__wasi_event_t],
|
|
timeout: Option<ClockEventData>,
|
|
) -> wasm32::size_t {
|
|
if let Some(ClockEventData { userdata, .. }) = timeout {
|
|
let output_event = host::__wasi_event_t {
|
|
userdata,
|
|
type_: wasm32::__WASI_EVENTTYPE_CLOCK,
|
|
error: wasm32::__WASI_ESUCCESS,
|
|
u: host::__wasi_event_t___wasi_event_u {
|
|
fd_readwrite: host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
|
|
nbytes: 0,
|
|
flags: 0,
|
|
},
|
|
},
|
|
};
|
|
output_slice[0] = enc_event(output_event);
|
|
1
|
|
} else {
|
|
// shouldn't happen
|
|
0
|
|
}
|
|
}
|
|
|
|
fn poll_oneoff_handle_fd_event<'t>(
|
|
output_slice: &mut [wasm32::__wasi_event_t],
|
|
events: impl Iterator<Item = (&'t FdEventData, &'t nix::poll::PollFd)>,
|
|
) -> wasm32::size_t {
|
|
let mut output_slice_cur = output_slice.iter_mut();
|
|
let mut revents_count = 0;
|
|
for (fd_event, poll_fd) in events {
|
|
let revents = match poll_fd.revents() {
|
|
Some(revents) => revents,
|
|
None => continue,
|
|
};
|
|
let mut nbytes = 0;
|
|
if fd_event.type_ == wasm32::__WASI_EVENTTYPE_FD_READ {
|
|
let _ = unsafe { fionread(fd_event.fd, &mut nbytes) };
|
|
}
|
|
let output_event = if revents.contains(nix::poll::EventFlags::POLLNVAL) {
|
|
host::__wasi_event_t {
|
|
userdata: fd_event.userdata,
|
|
type_: fd_event.type_,
|
|
error: wasm32::__WASI_EBADF,
|
|
u: host::__wasi_event_t___wasi_event_u {
|
|
fd_readwrite:
|
|
host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
|
|
nbytes: 0,
|
|
flags: wasm32::__WASI_EVENT_FD_READWRITE_HANGUP,
|
|
},
|
|
},
|
|
}
|
|
} else if revents.contains(nix::poll::EventFlags::POLLERR) {
|
|
host::__wasi_event_t {
|
|
userdata: fd_event.userdata,
|
|
type_: fd_event.type_,
|
|
error: wasm32::__WASI_EIO,
|
|
u: host::__wasi_event_t___wasi_event_u {
|
|
fd_readwrite:
|
|
host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
|
|
nbytes: 0,
|
|
flags: wasm32::__WASI_EVENT_FD_READWRITE_HANGUP,
|
|
},
|
|
},
|
|
}
|
|
} else if revents.contains(nix::poll::EventFlags::POLLHUP) {
|
|
host::__wasi_event_t {
|
|
userdata: fd_event.userdata,
|
|
type_: fd_event.type_,
|
|
error: wasm32::__WASI_ESUCCESS,
|
|
u: host::__wasi_event_t___wasi_event_u {
|
|
fd_readwrite:
|
|
host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
|
|
nbytes: 0,
|
|
flags: wasm32::__WASI_EVENT_FD_READWRITE_HANGUP,
|
|
},
|
|
},
|
|
}
|
|
} else if revents.contains(nix::poll::EventFlags::POLLIN)
|
|
| revents.contains(nix::poll::EventFlags::POLLOUT)
|
|
{
|
|
host::__wasi_event_t {
|
|
userdata: fd_event.userdata,
|
|
type_: fd_event.type_,
|
|
error: wasm32::__WASI_ESUCCESS,
|
|
u: host::__wasi_event_t___wasi_event_u {
|
|
fd_readwrite:
|
|
host::__wasi_event_t___wasi_event_u___wasi_event_u_fd_readwrite_t {
|
|
nbytes: nbytes as host::__wasi_filesize_t,
|
|
flags: 0,
|
|
},
|
|
},
|
|
}
|
|
} else {
|
|
continue;
|
|
};
|
|
*output_slice_cur.next().unwrap() = enc_event(output_event);
|
|
revents_count += 1;
|
|
}
|
|
revents_count
|
|
}
|