Merge pull request #552 from marmistrz/poll

Minimal viable implementation of poll_oneoff for Windows

Author: peterhuene

crates/test-programs/build.rs

@@ -176,7 +176,6 @@ mod wasi_tests {
                         "dangling_symlink" => true,
                         "symlink_loop" => true,
                         "truncation_rights" => true,
-                        "poll_oneoff" => true,
                         "path_link" => true,
                         "dangling_fd" => true,
                         _ => false,

crates/test-programs/wasi-tests/src/bin/poll_oneoff.rs

@@ -45,10 +45,6 @@ unsafe fn test_timeout() {
     }];
     let out = poll_oneoff_impl(&r#in, 1);
     let event = &out[0];
-    assert_eq!(
-        event.userdata, CLOCK_ID,
-        "the event.userdata should contain clock_id specified by the user"
-    );
     assert_eq!(
         event.error,
         wasi::ERRNO_SUCCESS,
@@ -59,6 +55,10 @@ unsafe fn test_timeout() {
         wasi::EVENTTYPE_CLOCK,
         "the event.type should equal clock"
     );
+    assert_eq!(
+        event.userdata, CLOCK_ID,
+        "the event.userdata should contain clock_id specified by the user"
+    );
 }
 
 unsafe fn test_stdin_read() {
@@ -77,6 +77,7 @@ unsafe fn test_stdin_read() {
             r#type: wasi::EVENTTYPE_CLOCK,
             u: wasi::SubscriptionU { clock },
         },
+        // Make sure that timeout is returned only once even if there are multiple read events
         wasi::Subscription {
             userdata: 1,
             r#type: wasi::EVENTTYPE_FD_READ,
@@ -85,10 +86,6 @@ unsafe fn test_stdin_read() {
     ];
     let out = poll_oneoff_impl(&r#in, 1);
     let event = &out[0];
-    assert_eq!(
-        event.userdata, CLOCK_ID,
-        "the event.userdata should contain clock_id specified by the user"
-    );
     assert_eq!(
         event.error,
         wasi::ERRNO_SUCCESS,
@@ -99,6 +96,10 @@ unsafe fn test_stdin_read() {
         wasi::EVENTTYPE_CLOCK,
         "the event.type should equal clock"
     );
+    assert_eq!(
+        event.userdata, CLOCK_ID,
+        "the event.userdata should contain clock_id specified by the user"
+    );
 }
 
 unsafe fn test_stdout_stderr_write() {

crates/wasi-common/src/error.rs

@@ -245,3 +245,18 @@ impl Error {
 pub(crate) trait FromRawOsError {
     fn from_raw_os_error(code: i32) -> Self;
 }
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
+
+pub(crate) trait AsWasiError {
+    fn as_wasi_error(&self) -> WasiError;
+}
+
+impl<T> AsWasiError for Result<T> {
+    fn as_wasi_error(&self) -> WasiError {
+        self.as_ref()
+            .err()
+            .unwrap_or(&Error::ESUCCESS)
+            .as_wasi_error()
+    }
+}

crates/wasi-common/src/lib.rs

@@ -42,5 +42,5 @@ pub mod hostcalls {
 pub use ctx::{WasiCtx, WasiCtxBuilder};
 pub use sys::preopen_dir;
 
-pub type Error = error::Error;
-pub(crate) type Result<T> = std::result::Result<T, Error>;
+pub use error::Error;
+pub(crate) use error::Result;