Rename runtime

Cargo.toml

@@ -5,10 +5,10 @@ members = [
   "ntex-bytes",
   "ntex-codec",
   "ntex-io",
-  "ntex-iodriver",
   "ntex-http",
   "ntex-router",
   "ntex-rt",
+  "ntex-neon",
   "ntex-net",
   "ntex-server",
   "ntex-service",
@@ -18,7 +18,6 @@ members = [
 
   "ntex-compio",
   "ntex-tokio",
-  "ntex-runtime",
 ]
 
 [workspace.package]
@@ -34,7 +33,7 @@ ntex = { path = "ntex" }
 ntex-bytes = { path = "ntex-bytes" }
 ntex-codec = { path = "ntex-codec" }
 ntex-io = { path = "ntex-io" }
-ntex-iodriver = { path = "ntex-iodriver" }
+ntex-neon = { path = "ntex-neon" }
 ntex-net = { path = "ntex-net" }
 ntex-http = { path = "ntex-http" }
 ntex-router = { path = "ntex-router" }
@@ -47,7 +46,6 @@ ntex-util = { path = "ntex-util" }
 
 ntex-compio = { path = "ntex-compio" }
 ntex-tokio = { path = "ntex-tokio" }
-ntex-runtime = { path = "ntex-runtime" }
 
 [workspace.dependencies]
 async-task = "4.5.0"

ntex-iodriver/LICENSE-APACHE

@@ -1 +0,0 @@
-../LICENSE-APACHE

ntex-iodriver/LICENSE-MIT

@@ -1 +0,0 @@
-../LICENSE-MIT

ntex-iodriver/README.md

@@ -1,13 +0,0 @@
----
-
-# ntex
-
-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/compio-rs/compio/blob/master/LICENSE)
-[![crates.io](https://img.shields.io/crates/v/compio)](https://crates.io/crates/compio)
-[![docs.rs](https://img.shields.io/badge/docs.rs-compio-latest)](https://docs.rs/compio)
-[![Check](https://github.com/compio-rs/compio/actions/workflows/ci_check.yml/badge.svg)](https://github.com/compio-rs/compio/actions/workflows/ci_check.yml)
-[![Test](https://github.com/compio-rs/compio/actions/workflows/ci_test.yml/badge.svg)](https://github.com/compio-rs/compio/actions/workflows/ci_test.yml)
-[![Telegram](https://img.shields.io/badge/Telegram-compio--rs-blue?logo=telegram)](https://t.me/compio_rs)
-
-A specialized runtime for ntex framework with IOCP/io_uring/polling support.
-This crate is inspired by [compio](https://github.com/compio-rs/compio/).

ntex-neon/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "ntex-iodriver"
+name = "ntex-neon"
 version = "0.1.0"
-description = "Low-level driver for ntex"
+description = "Async runtime for ntex"
 categories = ["asynchronous"]
-keywords = ["async", "iocp", "io-uring"]
+keywords = ["async", "runtime"]
 edition = { workspace = true }
 authors = { workspace = true }
 readme = { workspace = true }
@@ -12,8 +12,8 @@ repository = { workspace = true }
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
 default-target = "x86_64-unknown-linux-gnu"
+rustdoc-args = ["--cfg", "docsrs"]
 targets = [
     "x86_64-pc-windows-gnu",
     "x86_64-unknown-linux-gnu",
@@ -28,13 +28,13 @@ targets = [
 ]
 
 [dependencies]
-bitflags = { workspace = true }
-log = { workspace = true }
+async-task = { workspace = true }
 cfg-if = { workspace = true }
-crossbeam-channel = { workspace = true }
-socket2 = { workspace = true }
-slab = { workspace = true }
-nohash-hasher = { workspace = true }
+crossbeam-queue = { workspace = true }
+scoped-tls = { workspace = true }
+fxhash = { workspace = true }
+log = { workspace = true }
+socket2 = { workspace = true, features = ["all"] }
 
 # Windows specific dependencies
 [target.'cfg(windows)'.dependencies]
@@ -52,6 +52,12 @@ windows-sys = { workspace = true, features = [
     "Win32_System_WindowsProgramming",
 ] }
 
+# Unix specific dependencies
+[target.'cfg(unix)'.dependencies]
+crossbeam-channel = { workspace = true }
+crossbeam-queue = { workspace = true }
+libc = { workspace = true }
+
 # Linux specific dependencies
 [target.'cfg(target_os = "linux")'.dependencies]
 io-uring = { version = "0.7.0", optional = true }
@@ -61,10 +67,8 @@ polling = { version = "3.3.0", optional = true }
 [target.'cfg(all(not(target_os = "linux"), unix))'.dependencies]
 polling = "3.3.0"
 
-[target.'cfg(unix)'.dependencies]
-crossbeam-channel = { workspace = true }
-crossbeam-queue = { workspace = true }
-libc = { workspace = true }
+[target.'cfg(windows)'.dev-dependencies]
+windows-sys = { workspace = true, features = ["Win32_UI_WindowsAndMessaging"] }
 
 [build-dependencies]
 cfg_aliases = { workspace = true }
@@ -72,10 +76,3 @@ cfg_aliases = { workspace = true }
 [features]
 default = ["polling"]
 polling = ["dep:polling"]
-
-io-uring-sqe128 = []
-io-uring-cqe32 = []
-io-uring-socket = []
-
-iocp-global = []
-iocp-wait-packet = []

ntex-neon/src/lib.rs

@@ -3,6 +3,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 // #![warn(missing_docs)]
 
+pub mod driver;
 pub mod net;
 mod op;
 mod rt;

ntex-neon/src/net/socket.rs

@@ -1,9 +1,10 @@
 #![allow(clippy::missing_safety_doc)]
 use std::{future::Future, io, mem, mem::MaybeUninit};
 
-use ntex_iodriver::{impl_raw_fd, op::CloseSocket, op::ShutdownSocket, syscall, AsRawFd};
 use socket2::{Domain, Protocol, SockAddr, Socket as Socket2, Type};
 
+use crate::driver::{impl_raw_fd, op::CloseSocket, op::ShutdownSocket, syscall, AsRawFd};
+
 #[derive(Debug)]
 pub struct Socket {
     socket: Socket2,
@@ -41,7 +42,7 @@ impl Socket {
             //
             // https://patchwork.kernel.org/project/linux-block/patch/f999615b-205c-49b7-b272-c4e42e45e09d@kernel.dk/#22949861
             if cfg!(not(all(target_os = "linux", feature = "io-uring")))
-                || ntex_iodriver::DriverType::is_polling()
+                || crate::driver::DriverType::is_polling()
             {
                 socket.set_nonblocking(true)?;
             }
@@ -97,7 +98,7 @@ impl Socket {
             ty |= libc::SOCK_CLOEXEC;
         }
 
-        let op = ntex_iodriver::op::CreateSocket::new(
+        let op = crate::driver::op::CreateSocket::new(
             domain.into(),
             ty,
             protocol.map(|p| p.into()).unwrap_or_default(),
@@ -118,10 +119,6 @@ impl Socket {
         Ok(socket)
     }
 
-    pub fn listen(&self, backlog: i32) -> io::Result<()> {
-        self.socket.listen(backlog)
-    }
-
     pub fn close(self) -> impl Future<Output = io::Result<()>> {
         let op = CloseSocket::from_raw_fd(self.as_raw_fd());
         let fut = crate::submit(op);

ntex-neon/src/net/tcp.rs

@@ -1,9 +1,8 @@
 use std::{future::Future, io, net::SocketAddr};
 
-use ntex_iodriver::impl_raw_fd;
 use socket2::Socket as Socket2;
 
-use crate::net::Socket;
+use crate::{driver::impl_raw_fd, net::Socket};
 
 /// A TCP stream between a local and a remote socket.
 ///

ntex-neon/src/net/unix.rs

@@ -1,9 +1,8 @@
 use std::{future::Future, io};
 
-use ntex_iodriver::impl_raw_fd;
 use socket2::{SockAddr, Socket as Socket2};
 
-use crate::net::Socket;
+use crate::{driver::impl_raw_fd, net::Socket};
 
 /// A Unix stream between two local sockets on Windows & WSL.
 ///

ntex-neon/src/op.rs

@@ -1,7 +1,6 @@
 use std::{future::Future, io, pin::Pin, task::Context, task::Poll};
 
-use ntex_iodriver::{Key, OpCode, PushEntry};
-
+use crate::driver::{Key, OpCode, PushEntry};
 use crate::rt::Runtime;
 
 #[derive(Debug)]

ntex-neon/src/rt.rs

@@ -8,7 +8,8 @@ use std::{
 
 use async_task::{Runnable, Task};
 use crossbeam_queue::SegQueue;
-use ntex_iodriver::{
+
+use crate::driver::{
     op::Asyncify, AsRawFd, Key, NotifyHandle, OpCode, Proactor, ProactorBuilder, PushEntry,
     RawFd,
 };

ntex-net/Cargo.toml

@@ -25,7 +25,7 @@ tokio = ["ntex-rt/tokio", "ntex-tokio"]
 compio = ["ntex-rt/compio", "ntex-compio"]
 
 # default ntex runtime
-default-rt = ["ntex-rt/default-rt", "ntex-runtime", "ntex-iodriver", "slab", "socket2"]
+neon = ["ntex-rt/neon", "ntex-neon", "slab", "socket2"]
 
 [dependencies]
 ntex-service = "3.3"
@@ -37,8 +37,7 @@ ntex-util = "2.5"
 
 ntex-tokio = { version = "0.5.3", optional = true }
 ntex-compio = { version = "0.2.4", optional = true }
-ntex-runtime = { version = "0.1.0", optional = true }
-ntex-iodriver = { version = "0.1.0", optional = true }
+ntex-neon = { version = "0.1.0", optional = true }
 
 bitflags = { workspace = true }
 log = { workspace = true }

ntex-net/src/rt/connect.rs

@@ -1,10 +1,10 @@
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::{cell::RefCell, collections::VecDeque, io, path::Path, rc::Rc, task::Poll};
 
-use ntex_iodriver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
-use ntex_runtime::net::{Socket, TcpStream, UnixStream};
-use ntex_runtime::Runtime;
+use ntex_neon::driver::op::{Handler, Interest};
+use ntex_neon::driver::{syscall, AsRawFd, DriverApi, RawFd};
+use ntex_neon::net::{Socket, TcpStream, UnixStream};
+use ntex_neon::Runtime;
 use ntex_util::channel::oneshot::{channel, Sender};
 use slab::Slab;
 use socket2::{Protocol, SockAddr, Type};

ntex-net/src/rt/driver.rs

@@ -1,8 +1,8 @@
 use std::{cell::Cell, collections::VecDeque, fmt, io, ptr, rc::Rc, task, task::Poll};
 
-use ntex_iodriver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
-use ntex_runtime::Runtime;
+use ntex_neon::driver::op::{Handler, Interest};
+use ntex_neon::driver::{syscall, AsRawFd, DriverApi, RawFd};
+use ntex_neon::Runtime;
 use slab::Slab;
 
 use ntex_bytes::BufMut;

ntex-net/src/rt/mod.rs

@@ -9,10 +9,10 @@ mod driver;
 mod io;
 
 /// Tcp stream wrapper for compio TcpStream
-struct TcpStream(ntex_runtime::net::TcpStream);
+struct TcpStream(ntex_neon::net::TcpStream);
 
 /// Tcp stream wrapper for compio UnixStream
-struct UnixStream(ntex_runtime::net::UnixStream);
+struct UnixStream(ntex_neon::net::UnixStream);
 
 /// Opens a TCP connection to a remote host.
 pub async fn tcp_connect(addr: SocketAddr) -> Result<Io> {

ntex-rt/Cargo.toml

@@ -26,8 +26,8 @@ tokio = ["tok-io"]
 # compio support
 compio = ["compio-driver", "compio-runtime"]
 
-# default ntex runtime
-default-rt = ["ntex-runtime", "ntex-iodriver"]
+# neon runtime
+neon = ["ntex-neon"]
 
 [dependencies]
 async-channel = "2"
@@ -42,5 +42,4 @@ tok-io = { version = "1", package = "tokio", default-features = false, features
     "net",
 ], optional = true }
 
-ntex-runtime = { version = "0.1", optional = true }
-ntex-iodriver = { version = "0.1", optional = true }
+ntex-neon = { version = "0.1", optional = true }

ntex-rt/build.rs

@@ -7,7 +7,7 @@ fn main() {
         let _ = match key.as_ref() {
             "CARGO_FEATURE_COMPIO" => features.insert("compio"),
             "CARGO_FEATURE_TOKIO" => features.insert("tokio"),
-            "CARGO_FEATURE_DEFAULT_RT" => features.insert("default-rt"),
+            "CARGO_FEATURE_NEON" => features.insert("neon"),
             _ => false,
         };
     }

ntex-rt/src/lib.rs

@@ -253,14 +253,14 @@ mod default_rt {
     use std::task::{ready, Context, Poll};
     use std::{fmt, future::poll_fn, future::Future, pin::Pin};
 
-    use ntex_runtime::Runtime;
+    use ntex_neon::Runtime;
 
     /// Runs the provided future, blocking the current thread until the future
     /// completes.
     pub fn block_on<F: Future<Output = ()>>(fut: F) {
         log::info!(
             "Starting compio runtime, driver {:?}",
-            ntex_iodriver::DriverType::current()
+            ntex_neon::driver::DriverType::current()
         );
         let rt = Runtime::new().unwrap();
         rt.block_on(fut);
@@ -277,7 +277,7 @@ mod default_rt {
         T: Send + 'static,
     {
         JoinHandle {
-            fut: Some(ntex_runtime::spawn_blocking(f)),
+            fut: Some(ntex_neon::spawn_blocking(f)),
         }
     }
 
@@ -294,7 +294,7 @@ mod default_rt {
         F: Future + 'static,
     {
         let ptr = crate::CB.with(|cb| (cb.borrow().0)());
-        let task = ntex_runtime::spawn(async move {
+        let task = ntex_neon::spawn(async move {
             if let Some(ptr) = ptr {
                 let mut f = std::pin::pin!(f);
                 let result = poll_fn(|ctx| {
@@ -332,7 +332,7 @@ mod default_rt {
 
     /// A spawned task.
     pub struct Task<T> {
-        task: Option<ntex_runtime::Task<T>>,
+        task: Option<ntex_neon::Task<T>>,
     }
 
     impl<T> Task<T> {
@@ -371,7 +371,7 @@ mod default_rt {
     impl std::error::Error for JoinError {}
 
     pub struct JoinHandle<T> {
-        fut: Option<ntex_runtime::JoinHandle<T>>,
+        fut: Option<ntex_neon::JoinHandle<T>>,
     }
 
     impl<T> JoinHandle<T> {

ntex-runtime/Cargo.toml

@@ -1,58 +0,0 @@
-[package]
-name = "ntex-runtime"
-version = "0.1.0"
-description = "Async runtime for ntex"
-categories = ["asynchronous"]
-keywords = ["async", "runtime"]
-edition = { workspace = true }
-authors = { workspace = true }
-readme = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-
-[package.metadata.docs.rs]
-all-features = true
-default-target = "x86_64-unknown-linux-gnu"
-rustdoc-args = ["--cfg", "docsrs"]
-targets = [
-    "x86_64-pc-windows-gnu",
-    "x86_64-unknown-linux-gnu",
-    "x86_64-apple-darwin",
-    "aarch64-apple-ios",
-    "aarch64-linux-android",
-    "x86_64-unknown-dragonfly",
-    "x86_64-unknown-freebsd",
-    "x86_64-unknown-illumos",
-    "x86_64-unknown-netbsd",
-    "x86_64-unknown-openbsd",
-]
-
-[dependencies]
-ntex-iodriver = "0.1"
-
-async-task = { workspace = true }
-cfg-if = { workspace = true }
-crossbeam-queue = { workspace = true }
-scoped-tls = { workspace = true }
-fxhash = { workspace = true }
-log = { workspace = true }
-socket2 = { workspace = true, features = ["all"] }
-
-# Windows specific dependencies
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = [
-    "Win32_Foundation",
-    "Win32_Networking_WinSock",
-    "Win32_System_IO",
-] }
-
-# Unix specific dependencies
-[target.'cfg(unix)'.dependencies]
-libc = { workspace = true }
-
-[target.'cfg(windows)'.dev-dependencies]
-windows-sys = { workspace = true, features = ["Win32_UI_WindowsAndMessaging"] }
-
-[features]
-io-uring = ["ntex-iodriver/io-uring"]
-polling = ["ntex-iodriver/polling"]

ntex/Cargo.toml

@@ -48,8 +48,8 @@ tokio = ["ntex-net/tokio"]
 # compio runtime
 compio = ["ntex-net/compio"]
 
-# default ntex runtime
-default-rt = ["ntex-net/default-rt"]
+# neon runtime
+neon = ["ntex-net/neon"]
 
 # websocket support
 ws = ["dep:sha-1"]