Add support for WasmEdge.

Signed-off-by: Tricster <[email protected]>

.cargo/config

@@ -1,2 +1,7 @@
 # [build]
-# rustflags = ["--cfg", "tokio_unstable"]
+# rustflags = ["--cfg", "tokio_unstable"]
+[build]
+target="wasm32-wasi"
+
+[target.wasm32-wasi]
+runner = "wasmedge"

examples/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # If you copy one of the examples into a new project, you should be using
 # [dependencies] instead, and delete the **path**.
 [dev-dependencies]
-tokio = { version = "1.0.0", path = "../tokio", features = ["full", "tracing"] }
+tokio = { version = "1.0.0", path = "../tokio", features = ["sync", "macros", "io-util", "rt", "time", "net", "tracing"] }
 tokio-util = { version = "0.7.0", path = "../tokio-util", features = ["full"] }
 tokio-stream = { version = "0.1", path = "../tokio-stream" }
 

examples/chat.rs

@@ -39,7 +39,7 @@ use std::io;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};
     // Configure a `tracing` subscriber that logs traces emitted by the chat

examples/echo.rs

@@ -27,7 +27,7 @@ use tokio::net::TcpListener;
 use std::env;
 use std::error::Error;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     // Allow passing an address to listen on as the first argument of this
     // program, but otherwise we'll just set up our TCP listener on

examples/hello_world.rs

@@ -18,7 +18,7 @@ use tokio::net::TcpStream;
 
 use std::error::Error;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 pub async fn main() -> Result<(), Box<dyn Error>> {
     // Open a TCP stream to the socket address.
     //

examples/print_each_packet.rs

@@ -60,7 +60,7 @@ use tokio_util::codec::{BytesCodec, Decoder};
 
 use std::env;
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Allow passing an address to listen on as the first argument of this
     // program, but otherwise we'll just set up our TCP listener on

examples/tinydb.rs

@@ -81,7 +81,7 @@ enum Response {
     },
 }
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     // Parse the address we're going to run this server on
     // and set up our TCP listener to accept connections.

examples/tinyhttp.rs

@@ -23,7 +23,7 @@ use tokio::net::{TcpListener, TcpStream};
 use tokio_stream::StreamExt;
 use tokio_util::codec::{Decoder, Encoder, Framed};
 
-#[tokio::main]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     // Parse the arguments, bind the TCP socket we'll be listening to, spin up
     // our worker threads, and start shipping sockets to those worker threads.

tokio/Cargo.toml

@@ -113,7 +113,7 @@ pin-project-lite = "0.2.0"
 bytes = { version = "1.0.0", optional = true }
 once_cell = { version = "1.5.2", optional = true }
 memchr = { version = "2.2", optional = true }
-mio = { version = "0.8.4", optional = true }
+mio = {git="https://github.com/WasmEdge/mio.git", optional = true, features = ["wasmedge", "os-poll", "net"] }
 num_cpus = { version = "1.8.0", optional = true }
 parking_lot = { version = "0.12.0", optional = true }
 
@@ -159,6 +159,8 @@ rand = "0.8.0"
 
 [target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), not(target_os = "wasi")))'.dev-dependencies]
 wasm-bindgen-test = "0.3.0"
+[target.'cfg(target_os = "wasi")'.dependencies]
+wasmedge_wasi_socket = {git="https://github.com/second-state/wasmedge_wasi_socket.git"}
 
 [target.'cfg(target_os = "freebsd")'.dev-dependencies]
 mio-aio = { version = "0.6.0", features = ["tokio"] }

tokio/build.rs

@@ -93,7 +93,7 @@ fn main() {
     if target.starts_with("wasm") {
         autocfg::emit("tokio_wasm");
         if target.contains("wasi") {
-            autocfg::emit("tokio_wasi");
+            autocfg::emit("tokio_wasi_wasmedge");
         } else {
             autocfg::emit("tokio_wasm_not_wasi");
         }

tokio/src/lib.rs

@@ -434,32 +434,32 @@ compile_error! {
 //
 // Each condition is written all(a, not(b)). This should be read as
 // "if a, then we must also have b".
-#[cfg(any(
-    all(target_arch = "wasm32", not(tokio_wasm)),
-    all(target_arch = "wasm64", not(tokio_wasm)),
-    all(target_family = "wasm", not(tokio_wasm)),
-    all(target_os = "wasi", not(tokio_wasm)),
-    all(target_os = "wasi", not(tokio_wasi)),
-    all(target_os = "wasi", tokio_wasm_not_wasi),
-    all(tokio_wasm, not(any(target_arch = "wasm32", target_arch = "wasm64"))),
-    all(tokio_wasm_not_wasi, not(tokio_wasm)),
-    all(tokio_wasi, not(tokio_wasm))
-))]
-compile_error!("Tokio's build script has incorrectly detected wasm.");
-
-#[cfg(all(
-    not(tokio_unstable),
-    tokio_wasm,
-    any(
-        feature = "fs",
-        feature = "io-std",
-        feature = "net",
-        feature = "process",
-        feature = "rt-multi-thread",
-        feature = "signal"
-    )
-))]
-compile_error!("Only features sync,macros,io-util,rt,time are supported on wasm.");
+// #[cfg(any(
+//     all(target_arch = "wasm32", not(tokio_wasm)),
+//     all(target_arch = "wasm64", not(tokio_wasm)),
+//     all(target_family = "wasm", not(tokio_wasm)),
+//     all(target_os = "wasi", not(tokio_wasm)),
+//     all(target_os = "wasi", not(tokio_wasi)),
+//     all(target_os = "wasi", tokio_wasm_not_wasi),
+//     all(tokio_wasm, not(any(target_arch = "wasm32", target_arch = "wasm64"))),
+//     all(tokio_wasm_not_wasi, not(tokio_wasm)),
+//     all(tokio_wasi, not(tokio_wasm))
+// ))]
+// compile_error!("Tokio's build script has incorrectly detected wasm.");
+
+// #[cfg(all(
+//     not(tokio_unstable),
+//     tokio_wasm,
+//     any(
+//         feature = "fs",
+//         feature = "io-std",
+//         feature = "net",
+//         feature = "process",
+//         feature = "rt-multi-thread",
+//         feature = "signal"
+//     )
+// ))]
+// compile_error!("Only features sync,macros,io-util,rt,time are supported on wasm.");
 
 // Includes re-exports used by macros.
 //
@@ -481,6 +481,7 @@ pub mod net;
 mod loom;
 mod park;
 
+#[cfg(not(target_os = "wasi"))]
 cfg_process! {
     pub mod process;
 }
@@ -504,10 +505,12 @@ cfg_not_rt! {
 
 pub(crate) mod coop;
 
+#[cfg(not(target_os = "wasi"))]
 cfg_signal! {
     pub mod signal;
 }
 
+#[cfg(not(target_os = "wasi"))]
 cfg_signal_internal! {
     #[cfg(not(feature = "signal"))]
     #[allow(dead_code)]

tokio/src/net/mod.rs

@@ -39,8 +39,8 @@ cfg_net! {
     cfg_not_wasi! {
         pub use tcp::socket::TcpSocket;
 
-        mod udp;
-        pub use udp::UdpSocket;
+        // mod udp;
+        // pub use udp::UdpSocket;
     }
 }
 

tokio/src/net/tcp/listener.rs

@@ -228,12 +228,22 @@ impl TcpListener {
     /// from a future driven by a tokio runtime, otherwise runtime can be set
     /// explicitly with [`Runtime::enter`](crate::runtime::Runtime::enter) function.
     #[track_caller]
+    #[cfg(not(target_os = "wasi"))]
     pub fn from_std(listener: net::TcpListener) -> io::Result<TcpListener> {
         let io = mio::net::TcpListener::from_std(listener);
         let io = PollEvented::new(io)?;
         Ok(TcpListener { io })
     }
 
+    /// Creates new `TcpListener` from a `std::net::TcpListener`.
+    ///
+    #[cfg(target_os = "wasi")]
+    pub fn from_std(listener: wasmedge_wasi_socket::TcpListener) -> io::Result<TcpListener> {
+        let io = mio::net::TcpListener::from_std(listener);
+        let io = PollEvented::new(io)?;
+        Ok(TcpListener { io })
+    }
+
     /// Turns a [`tokio::net::TcpListener`] into a [`std::net::TcpListener`].
     ///
     /// The returned [`std::net::TcpListener`] will have nonblocking mode set as
@@ -256,6 +266,7 @@ impl TcpListener {
     /// [`tokio::net::TcpListener`]: TcpListener
     /// [`std::net::TcpListener`]: std::net::TcpListener
     /// [`set_nonblocking`]: fn@std::net::TcpListener::set_nonblocking
+    #[cfg(not(target_os = "wasi"))]
     pub fn into_std(self) -> io::Result<std::net::TcpListener> {
         #[cfg(unix)]
         {
@@ -315,6 +326,13 @@ impl TcpListener {
     ///     Ok(())
     /// }
     /// ```
+    #[cfg(not(target_os = "wasi"))]
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {
+        self.io.local_addr()
+    }
+
+    /// Returns the local address that this listener is bound to.
+    #[cfg(target_os = "wasi")]
     pub fn local_addr(&self) -> io::Result<SocketAddr> {
         self.io.local_addr()
     }
@@ -371,7 +389,7 @@ impl TcpListener {
         self.io.set_ttl(ttl)
     }
 }
-
+#[cfg(not(target_os = "wasi"))]
 impl TryFrom<net::TcpListener> for TcpListener {
     type Error = io::Error;