Added epoll to WASIX

lib/wasi-types/src/wasi/bindings.rs

@@ -18,6 +18,8 @@ pub type Filesize = u64;
 pub type Timestamp = u64;
 #[doc = " A file descriptor handle."]
 pub type Fd = u32;
+#[doc = " Reference to a waker (used for asynchronous IO)."]
+pub type WakerId = u64;
 #[doc = " A reference to the offset of a directory entry."]
 pub type Dircookie = u64;
 #[doc = " The type for the `dirent::d-namlen` field of `dirent` struct."]
@@ -255,6 +257,10 @@ pub enum Errno {
     Shutdown,
     #[doc = " Memory access violation."]
     Memviolation,
+
+    /// ID's unique to WASIX
+    #[doc = " Invocation is pending until the waker is woken."]
+    Pending = 100,
     #[doc = " An unknown error has occured"]
     Unknown,
 }
@@ -340,6 +346,7 @@ impl Errno {
             Errno::Notcapable => "notcapable",
             Errno::Shutdown => "shutdown",
             Errno::Memviolation => "memviolation",
+            Errno::Pending => "pending",
             Errno::Unknown => "unknown",
         }
     }
@@ -424,6 +431,7 @@ impl Errno {
             Errno::Notcapable => "Extension: Capabilities insufficient.",
             Errno::Shutdown => "Cannot send after socket shutdown.",
             Errno::Memviolation => "Memory access violation.",
+            Errno::Pending => "Pending asynchronous wake.",
             Errno::Unknown => "An unknown error has occured",
         }
     }

lib/wasi/src/lib.rs

@@ -461,10 +461,13 @@ fn wasix_exports_32(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "fd_filestat_set_size" => Function::new_typed_with_env(&mut store, env, fd_filestat_set_size),
         "fd_filestat_set_times" => Function::new_typed_with_env(&mut store, env, fd_filestat_set_times),
         "fd_pread" => Function::new_typed_with_env(&mut store, env, fd_pread::<Memory32>),
+        "fd_pread_poll" => Function::new_typed_with_env(&mut store, env, fd_pread_poll::<Memory32>),
         "fd_prestat_get" => Function::new_typed_with_env(&mut store, env, fd_prestat_get::<Memory32>),
         "fd_prestat_dir_name" => Function::new_typed_with_env(&mut store, env, fd_prestat_dir_name::<Memory32>),
         "fd_pwrite" => Function::new_typed_with_env(&mut store, env, fd_pwrite::<Memory32>),
+        "fd_pwrite_poll" => Function::new_typed_with_env(&mut store, env, fd_pwrite_poll::<Memory32>),
         "fd_read" => Function::new_typed_with_env(&mut store, env, fd_read::<Memory32>),
+        "fd_read_poll" => Function::new_typed_with_env(&mut store, env, fd_read_poll::<Memory32>),
         "fd_readdir" => Function::new_typed_with_env(&mut store, env, fd_readdir::<Memory32>),
         "fd_renumber" => Function::new_typed_with_env(&mut store, env, fd_renumber),
         "fd_dup" => Function::new_typed_with_env(&mut store, env, fd_dup::<Memory32>),
@@ -473,6 +476,7 @@ fn wasix_exports_32(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "fd_sync" => Function::new_typed_with_env(&mut store, env, fd_sync),
         "fd_tell" => Function::new_typed_with_env(&mut store, env, fd_tell::<Memory32>),
         "fd_write" => Function::new_typed_with_env(&mut store, env, fd_write::<Memory32>),
+        "fd_write_poll" => Function::new_typed_with_env(&mut store, env, fd_write_poll::<Memory32>),
         "fd_pipe" => Function::new_typed_with_env(&mut store, env, fd_pipe::<Memory32>),
         "path_create_directory" => Function::new_typed_with_env(&mut store, env, path_create_directory::<Memory32>),
         "path_filestat_get" => Function::new_typed_with_env(&mut store, env, path_filestat_get::<Memory32>),
@@ -488,6 +492,7 @@ fn wasix_exports_32(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "proc_exit" => Function::new_typed_with_env(&mut store, env, proc_exit::<Memory32>),
         "proc_fork" => Function::new_typed_with_env(&mut store, env, proc_fork::<Memory32>),
         "proc_join" => Function::new_typed_with_env(&mut store, env, proc_join::<Memory32>),
+        "proc_join_poll" => Function::new_typed_with_env(&mut store, env, proc_join_poll::<Memory32>),
         "proc_signal" => Function::new_typed_with_env(&mut store, env, proc_signal::<Memory32>),
         "proc_exec" => Function::new_typed_with_env(&mut store, env, proc_exec::<Memory32>),
         "proc_raise" => Function::new_typed_with_env(&mut store, env, proc_raise),
@@ -504,21 +509,26 @@ fn wasix_exports_32(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "callback_thread" => Function::new_typed_with_env(&mut store, env, callback_thread::<Memory32>),
         "callback_reactor" => Function::new_typed_with_env(&mut store, env, callback_reactor::<Memory32>),
         "callback_thread_local_destroy" => Function::new_typed_with_env(&mut store, env, callback_thread_local_destroy::<Memory32>),
+        "callback_waker_wake" => Function::new_typed_with_env(&mut store, env, callback_waker_wake::<Memory32>),
+        "callback_waker_drop" => Function::new_typed_with_env(&mut store, env, callback_waker_drop::<Memory32>),
         "thread_spawn" => Function::new_typed_with_env(&mut store, env, thread_spawn::<Memory32>),
         "thread_local_create" => Function::new_typed_with_env(&mut store, env, thread_local_create::<Memory32>),
         "thread_local_destroy" => Function::new_typed_with_env(&mut store, env, thread_local_destroy),
         "thread_local_set" => Function::new_typed_with_env(&mut store, env, thread_local_set),
         "thread_local_get" => Function::new_typed_with_env(&mut store, env, thread_local_get::<Memory32>),
         "thread_sleep" => Function::new_typed_with_env(&mut store, env, thread_sleep::<Memory32>),
+        "thread_sleep_poll" => Function::new_typed_with_env(&mut store, env, thread_sleep_poll::<Memory32>),
         "thread_id" => Function::new_typed_with_env(&mut store, env, thread_id::<Memory32>),
         "thread_signal" => Function::new_typed_with_env(&mut store, env, thread_signal),
         "thread_join" => Function::new_typed_with_env(&mut store, env, thread_join::<Memory32>),
+        "thread_join_poll" => Function::new_typed_with_env(&mut store, env, thread_join_poll::<Memory32>),
         "thread_parallelism" => Function::new_typed_with_env(&mut store, env, thread_parallelism::<Memory32>),
         "thread_exit" => Function::new_typed_with_env(&mut store, env, thread_exit),
         "sched_yield" => Function::new_typed_with_env(&mut store, env, sched_yield::<Memory32>),
         "stack_checkpoint" => Function::new_typed_with_env(&mut store, env, stack_checkpoint::<Memory32>),
         "stack_restore" => Function::new_typed_with_env(&mut store, env, stack_restore::<Memory32>),
         "futex_wait" => Function::new_typed_with_env(&mut store, env, futex_wait::<Memory32>),
+        "futex_wait_poll" => Function::new_typed_with_env(&mut store, env, futex_wait_poll::<Memory32>),
         "futex_wake" => Function::new_typed_with_env(&mut store, env, futex_wake::<Memory32>),
         "futex_wake_all" => Function::new_typed_with_env(&mut store, env, futex_wake_all::<Memory32>),
         "port_bridge" => Function::new_typed_with_env(&mut store, env, port_bridge::<Memory32>),
@@ -551,11 +561,16 @@ fn wasix_exports_32(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "sock_bind" => Function::new_typed_with_env(&mut store, env, sock_bind::<Memory32>),
         "sock_listen" => Function::new_typed_with_env(&mut store, env, sock_listen::<Memory32>),
         "sock_accept" => Function::new_typed_with_env(&mut store, env, sock_accept::<Memory32>),
+        "sock_accept_poll" => Function::new_typed_with_env(&mut store, env, sock_accept_poll::<Memory32>),
         "sock_connect" => Function::new_typed_with_env(&mut store, env, sock_connect::<Memory32>),
         "sock_recv" => Function::new_typed_with_env(&mut store, env, sock_recv::<Memory32>),
+        "sock_recv_poll" => Function::new_typed_with_env(&mut store, env, sock_recv_poll::<Memory32>),
         "sock_recv_from" => Function::new_typed_with_env(&mut store, env, sock_recv_from::<Memory32>),
+        "sock_recv_from_poll" => Function::new_typed_with_env(&mut store, env, sock_recv_from_poll::<Memory32>),
         "sock_send" => Function::new_typed_with_env(&mut store, env, sock_send::<Memory32>),
+        "sock_send_poll" => Function::new_typed_with_env(&mut store, env, sock_send_poll::<Memory32>),
         "sock_send_to" => Function::new_typed_with_env(&mut store, env, sock_send_to::<Memory32>),
+        "sock_send_to_poll" => Function::new_typed_with_env(&mut store, env, sock_send_to_poll::<Memory32>),
         "sock_send_file" => Function::new_typed_with_env(&mut store, env, sock_send_file::<Memory32>),
         "sock_shutdown" => Function::new_typed_with_env(&mut store, env, sock_shutdown),
         "resolve" => Function::new_typed_with_env(&mut store, env, resolve::<Memory32>),
@@ -584,10 +599,13 @@ fn wasix_exports_64(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "fd_filestat_set_size" => Function::new_typed_with_env(&mut store, env, fd_filestat_set_size),
         "fd_filestat_set_times" => Function::new_typed_with_env(&mut store, env, fd_filestat_set_times),
         "fd_pread" => Function::new_typed_with_env(&mut store, env, fd_pread::<Memory64>),
+        "fd_pread_poll" => Function::new_typed_with_env(&mut store, env, fd_pread_poll::<Memory64>),
         "fd_prestat_get" => Function::new_typed_with_env(&mut store, env, fd_prestat_get::<Memory64>),
         "fd_prestat_dir_name" => Function::new_typed_with_env(&mut store, env, fd_prestat_dir_name::<Memory64>),
         "fd_pwrite" => Function::new_typed_with_env(&mut store, env, fd_pwrite::<Memory64>),
+        "fd_pwrite_poll" => Function::new_typed_with_env(&mut store, env, fd_pwrite_poll::<Memory64>),
         "fd_read" => Function::new_typed_with_env(&mut store, env, fd_read::<Memory64>),
+        "fd_read_poll" => Function::new_typed_with_env(&mut store, env, fd_read_poll::<Memory64>),
         "fd_readdir" => Function::new_typed_with_env(&mut store, env, fd_readdir::<Memory64>),
         "fd_renumber" => Function::new_typed_with_env(&mut store, env, fd_renumber),
         "fd_dup" => Function::new_typed_with_env(&mut store, env, fd_dup::<Memory64>),
@@ -596,6 +614,7 @@ fn wasix_exports_64(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "fd_sync" => Function::new_typed_with_env(&mut store, env, fd_sync),
         "fd_tell" => Function::new_typed_with_env(&mut store, env, fd_tell::<Memory64>),
         "fd_write" => Function::new_typed_with_env(&mut store, env, fd_write::<Memory64>),
+        "fd_write_poll" => Function::new_typed_with_env(&mut store, env, fd_write_poll::<Memory64>),
         "fd_pipe" => Function::new_typed_with_env(&mut store, env, fd_pipe::<Memory64>),
         "path_create_directory" => Function::new_typed_with_env(&mut store, env, path_create_directory::<Memory64>),
         "path_filestat_get" => Function::new_typed_with_env(&mut store, env, path_filestat_get::<Memory64>),
@@ -611,6 +630,7 @@ fn wasix_exports_64(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "proc_exit" => Function::new_typed_with_env(&mut store, env, proc_exit::<Memory64>),
         "proc_fork" => Function::new_typed_with_env(&mut store, env, proc_fork::<Memory64>),
         "proc_join" => Function::new_typed_with_env(&mut store, env, proc_join::<Memory64>),
+        "proc_join_poll" => Function::new_typed_with_env(&mut store, env, proc_join_poll::<Memory64>),
         "proc_signal" => Function::new_typed_with_env(&mut store, env, proc_signal::<Memory64>),
         "proc_exec" => Function::new_typed_with_env(&mut store, env, proc_exec::<Memory64>),
         "proc_raise" => Function::new_typed_with_env(&mut store, env, proc_raise),
@@ -627,21 +647,26 @@ fn wasix_exports_64(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "callback_thread" => Function::new_typed_with_env(&mut store, env, callback_thread::<Memory64>),
         "callback_reactor" => Function::new_typed_with_env(&mut store, env, callback_reactor::<Memory64>),
         "callback_thread_local_destroy" => Function::new_typed_with_env(&mut store, env, callback_thread_local_destroy::<Memory64>),
+        "callback_waker_wake" => Function::new_typed_with_env(&mut store, env, callback_waker_wake::<Memory64>),
+        "callback_waker_drop" => Function::new_typed_with_env(&mut store, env, callback_waker_drop::<Memory64>),
         "thread_spawn" => Function::new_typed_with_env(&mut store, env, thread_spawn::<Memory64>),
         "thread_local_create" => Function::new_typed_with_env(&mut store, env, thread_local_create::<Memory64>),
         "thread_local_destroy" => Function::new_typed_with_env(&mut store, env, thread_local_destroy),
         "thread_local_set" => Function::new_typed_with_env(&mut store, env, thread_local_set),
         "thread_local_get" => Function::new_typed_with_env(&mut store, env, thread_local_get::<Memory64>),
         "thread_sleep" => Function::new_typed_with_env(&mut store, env, thread_sleep::<Memory64>),
+        "thread_sleep_poll" => Function::new_typed_with_env(&mut store, env, thread_sleep_poll::<Memory64>),
         "thread_id" => Function::new_typed_with_env(&mut store, env, thread_id::<Memory64>),
         "thread_signal" => Function::new_typed_with_env(&mut store, env, thread_signal),
         "thread_join" => Function::new_typed_with_env(&mut store, env, thread_join::<Memory64>),
+        "thread_join_poll" => Function::new_typed_with_env(&mut store, env, thread_join_poll::<Memory64>),
         "thread_parallelism" => Function::new_typed_with_env(&mut store, env, thread_parallelism::<Memory64>),
         "thread_exit" => Function::new_typed_with_env(&mut store, env, thread_exit),
         "sched_yield" => Function::new_typed_with_env(&mut store, env, sched_yield::<Memory64>),
         "stack_checkpoint" => Function::new_typed_with_env(&mut store, env, stack_checkpoint::<Memory64>),
         "stack_restore" => Function::new_typed_with_env(&mut store, env, stack_restore::<Memory64>),
         "futex_wait" => Function::new_typed_with_env(&mut store, env, futex_wait::<Memory64>),
+        "futex_wait_poll" => Function::new_typed_with_env(&mut store, env, futex_wait_poll::<Memory64>),
         "futex_wake" => Function::new_typed_with_env(&mut store, env, futex_wake::<Memory64>),
         "futex_wake_all" => Function::new_typed_with_env(&mut store, env, futex_wake_all::<Memory64>),
         "port_bridge" => Function::new_typed_with_env(&mut store, env, port_bridge::<Memory64>),
@@ -674,11 +699,16 @@ fn wasix_exports_64(mut store: &mut impl AsStoreMut, env: &FunctionEnv<WasiEnv>)
         "sock_bind" => Function::new_typed_with_env(&mut store, env, sock_bind::<Memory64>),
         "sock_listen" => Function::new_typed_with_env(&mut store, env, sock_listen::<Memory64>),
         "sock_accept" => Function::new_typed_with_env(&mut store, env, sock_accept::<Memory64>),
+        "sock_accept_poll" => Function::new_typed_with_env(&mut store, env, sock_accept_poll::<Memory64>),
         "sock_connect" => Function::new_typed_with_env(&mut store, env, sock_connect::<Memory64>),
         "sock_recv" => Function::new_typed_with_env(&mut store, env, sock_recv::<Memory64>),
+        "sock_recv_poll" => Function::new_typed_with_env(&mut store, env, sock_recv_poll::<Memory64>),
         "sock_recv_from" => Function::new_typed_with_env(&mut store, env, sock_recv_from::<Memory64>),
+        "sock_recv_from_poll" => Function::new_typed_with_env(&mut store, env, sock_recv_from_poll::<Memory64>),
         "sock_send" => Function::new_typed_with_env(&mut store, env, sock_send::<Memory64>),
+        "sock_send_poll" => Function::new_typed_with_env(&mut store, env, sock_send_poll::<Memory64>),
         "sock_send_to" => Function::new_typed_with_env(&mut store, env, sock_send_to::<Memory64>),
+        "sock_send_to_poll" => Function::new_typed_with_env(&mut store, env, sock_send_to_poll::<Memory64>),
         "sock_send_file" => Function::new_typed_with_env(&mut store, env, sock_send_file::<Memory64>),
         "sock_shutdown" => Function::new_typed_with_env(&mut store, env, sock_shutdown),
         "resolve" => Function::new_typed_with_env(&mut store, env, resolve::<Memory64>),

lib/wasi/src/state/builder.rs

@@ -716,6 +716,7 @@ impl WasiEnvBuilder {
 
         let state = WasiState {
             fs: wasi_fs,
+            wakers: Default::default(),
             secret: rand::thread_rng().gen::<[u8; 32]>(),
             inodes,
             args: self.args.clone(),