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

Get rid of hangup, it's incorrect

Browse Source
This commit is contained in:
Marcin Mielniczuk
2020-01-16 19:41:34 +01:00
parent caa6897af5
commit 4f9218eded
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/api/c-examples/wasm-c-api Submodule

Submodule crates/api/c-examples/wasm-c-api added at d9a80099d4

1
crates/wasi-common/WASI Submodule

Submodule crates/wasi-common/WASI added at 04d4eba571

30
crates/wasi-common/src/sys/windows/hostcalls_impl/misc.rs
View File

@@ -24,7 +24,6 @@ struct StdinPoll {
enum PollState { enum PollState {
Ready, Ready,
Closed,
NotReady, // it's not ready, but we didn't wait NotReady, // it's not ready, but we didn't wait
TimedOut, // it's not ready and a timeout has occurred TimedOut, // it's not ready and a timeout has occurred
Error(Error), Error(Error),
@@ -74,9 +73,12 @@ impl StdinPoll {
use std::io::BufRead; use std::io::BufRead;
loop { loop {
request_rx.recv().expect("request_rx channel closed"); request_rx.recv().expect("request_rx channel closed");
let resp = match std::io::stdin().lock().fill_buf().map(|s| !s.is_empty()) { // If `fill_buf` returns any slice, then it means that either
Ok(true) => PollState::Ready, // (a) there some data in stdout, if it's non-empty
Ok(false) => PollState::Closed, // (b) EOF was received, if it's empty
// Linux returns `POLLIN` in both cases, and we imitate this behavior.
let resp = match std::io::stdin().lock().fill_buf() {
Ok(_) => PollState::Ready,
Err(e) => PollState::Error(e.into()), Err(e) => PollState::Error(e.into()),
}; };
notify_tx.send(resp).expect("notify_tx channel closed"); notify_tx.send(resp).expect("notify_tx channel closed");
@@ -187,20 +189,6 @@ fn make_timeout_event(timeout: &ClockEventData) -> wasi::__wasi_event_t {
} }
} }
fn make_hangup_event(fd_event: &FdEventData) -> wasi::__wasi_event_t {
wasi::__wasi_event_t {
userdata: fd_event.userdata,
r#type: fd_event.r#type,
error: wasi::__WASI_ERRNO_SUCCESS,
u: wasi::__wasi_event_u_t {
fd_readwrite: wasi::__wasi_event_fd_readwrite_t {
nbytes: 0,
flags: wasi::__WASI_EVENTRWFLAGS_FD_READWRITE_HANGUP,
},
},
}
}
fn handle_timeout( fn handle_timeout(
timeout_event: ClockEventData, timeout_event: ClockEventData,
timeout: Duration, timeout: Duration,
@@ -215,11 +203,6 @@ fn handle_timeout_event(timeout_event: ClockEventData, events: &mut Vec<wasi::__
events.push(new_event); events.push(new_event);
} }
fn handle_hangup_event(event: FdEventData, events: &mut Vec<wasi::__wasi_event_t>) {
let new_event = make_hangup_event(&event);
events.push(new_event)
}
fn handle_rw_event(event: FdEventData, out_events: &mut Vec<wasi::__wasi_event_t>) { fn handle_rw_event(event: FdEventData, out_events: &mut Vec<wasi::__wasi_event_t>) {
let size = match event.descriptor { let size = match event.descriptor {
Descriptor::OsHandle(os_handle) => { Descriptor::OsHandle(os_handle) => {
@@ -366,7 +349,6 @@ pub(crate) fn poll_oneoff(
match state { match state {
PollState::Ready => handle_rw_event(event, events), PollState::Ready => handle_rw_event(event, events),
PollState::NotReady => {} // not immediately available, so just ignore PollState::NotReady => {} // not immediately available, so just ignore
PollState::Closed => handle_hangup_event(event, events), // TODO check if actually a POLLHUP on Linux
PollState::TimedOut => handle_timeout_event(timeout.unwrap().0, events), PollState::TimedOut => handle_timeout_event(timeout.unwrap().0, events),
PollState::Error(ref e) => { PollState::Error(ref e) => {
error!("FIXME return real error"); error!("FIXME return real error");