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

update nix version

Browse Source
This commit is contained in:
Sendil Kumar
2019-08-22 22:26:04 +02:00
committed by Jakub Konka
parent 1bf5106f40
commit 69d60c4711
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -21,7 +21,7 @@ log = "0.4"
filetime = "0.2.7" filetime = "0.2.7"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = "0.13" nix = "0.15"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winx = { path = "winx" } winx = { path = "winx" }

17
src/sys/unix/hostcalls_impl/misc.rs
View File

@@ -3,7 +3,6 @@
use crate::memory::*; use crate::memory::*;
use crate::sys::host_impl; use crate::sys::host_impl;
use crate::{host, wasm32, Result}; use crate::{host, wasm32, Result};
use nix::convert_ioctl_res;
use nix::libc::{self, c_int}; use nix::libc::{self, c_int};
use std::cmp; use std::cmp;
use std::time::SystemTime; use std::time::SystemTime;
@@ -104,10 +103,10 @@ pub(crate) fn poll_oneoff(
let mut poll_fds: Vec<_> = fd_events let mut poll_fds: Vec<_> = fd_events
.iter() .iter()
.map(|event| { .map(|event| {
let mut flags = nix::poll::EventFlags::empty(); let mut flags = nix::poll::PollFlags::empty();
match event.type_ { match event.type_ {
wasm32::__WASI_EVENTTYPE_FD_READ => flags.insert(nix::poll::EventFlags::POLLIN), wasm32::__WASI_EVENTTYPE_FD_READ => flags.insert(nix::poll::PollFlags::POLLIN),
wasm32::__WASI_EVENTTYPE_FD_WRITE => flags.insert(nix::poll::EventFlags::POLLOUT), wasm32::__WASI_EVENTTYPE_FD_WRITE => flags.insert(nix::poll::PollFlags::POLLOUT),
// An event on a file descriptor can currently only be of type FD_READ or FD_WRITE // 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 // 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. // events we filtered before. If we get something else here, the code has a serious bug.
@@ -210,7 +209,7 @@ fn poll_oneoff_handle_fd_event<'t>(
if fd_event.type_ == wasm32::__WASI_EVENTTYPE_FD_READ { if fd_event.type_ == wasm32::__WASI_EVENTTYPE_FD_READ {
let _ = unsafe { fionread(fd_event.fd, &mut nbytes) }; let _ = unsafe { fionread(fd_event.fd, &mut nbytes) };
} }
let output_event = if revents.contains(nix::poll::EventFlags::POLLNVAL) { let output_event = if revents.contains(nix::poll::PollFlags::POLLNVAL) {
host::__wasi_event_t { host::__wasi_event_t {
userdata: fd_event.userdata, userdata: fd_event.userdata,
type_: fd_event.type_, type_: fd_event.type_,
@@ -223,7 +222,7 @@ fn poll_oneoff_handle_fd_event<'t>(
}, },
}, },
} }
} else if revents.contains(nix::poll::EventFlags::POLLERR) { } else if revents.contains(nix::poll::PollFlags::POLLERR) {
host::__wasi_event_t { host::__wasi_event_t {
userdata: fd_event.userdata, userdata: fd_event.userdata,
type_: fd_event.type_, type_: fd_event.type_,
@@ -236,7 +235,7 @@ fn poll_oneoff_handle_fd_event<'t>(
}, },
}, },
} }
} else if revents.contains(nix::poll::EventFlags::POLLHUP) { } else if revents.contains(nix::poll::PollFlags::POLLHUP) {
host::__wasi_event_t { host::__wasi_event_t {
userdata: fd_event.userdata, userdata: fd_event.userdata,
type_: fd_event.type_, type_: fd_event.type_,
@@ -249,8 +248,8 @@ fn poll_oneoff_handle_fd_event<'t>(
}, },
}, },
} }
} else if revents.contains(nix::poll::EventFlags::POLLIN) } else if revents.contains(nix::poll::PollFlags::POLLIN)
| revents.contains(nix::poll::EventFlags::POLLOUT) | revents.contains(nix::poll::PollFlags::POLLOUT)
{ {
host::__wasi_event_t { host::__wasi_event_t {
userdata: fd_event.userdata, userdata: fd_event.userdata,