Rename runtime to neon (#513)

.github/workflows/cov.yml

@@ -32,11 +32,11 @@ jobs:
       - name: Code coverage (compio)
         run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
-      - name: Code coverage (default)
+      - name: Code coverage (neon)
-        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/default-rt,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
+        run: cargo llvm-cov --no-report --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
       - name: Generate coverage report
-        run: cargo llvm-cov report --lcov --output-path lcov.info --ignore-filename-regex="ntex-compio|ntex-tokio|ntex-async-std"
+        run: cargo llvm-cov report --lcov --output-path lcov.info --ignore-filename-regex="ntex-compio|ntex-tokio"
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

.github/workflows/linux.yml

@@ -54,10 +54,10 @@ jobs:
         run: |
           cargo test --all --no-default-features --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
-      - name: Run tests (default)
+      - name: Run tests (neon)
         timeout-minutes: 40
         run: |
-          cargo test --all --no-default-features --features="ntex/default-rt,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
+          cargo test --all --no-default-features --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
       - name: Install cargo-cache
         continue-on-error: true

.github/workflows/osx.yml

@@ -44,9 +44,9 @@ jobs:
         timeout-minutes: 40
         run: cargo test --all --no-default-features --no-fail-fast --features="ntex/compio,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
-      - name: Run tests (default)
+      - name: Run tests (neon)
         timeout-minutes: 40
-        run: cargo test --all --no-default-features --no-fail-fast --features="ntex/default-rt,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
+        run: cargo test --all --no-default-features --no-fail-fast --features="ntex/neon,ntex/cookie,ntex/url,ntex/compress,ntex/openssl,ntex/rustls,ntex/ws,ntex/brotli"
 
       - name: Install cargo-cache
         continue-on-error: true

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"
@@ -60,6 +58,8 @@ futures-util = "0.3.29"
 fxhash = "0.2"
 libc = "0.2.164"
 log = "0.4"
+io-uring = "0.7.4"
+polling = "3.3.0"
 nohash-hasher = "0.2.0"
 scoped-tls = "1.0.1"
 slab = "0.4.9"

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,15 @@ targets = [
 ]
 
 [dependencies]
+async-task = { workspace = true }
 bitflags = { workspace = true }
-log = { workspace = true }
 cfg-if = { workspace = true }
-crossbeam-channel = { workspace = true }
+crossbeam-queue = { workspace = true }
-socket2 = { workspace = true }
+fxhash = { workspace = true }
-slab = { workspace = true }
 nohash-hasher = { workspace = true }
+log = { workspace = true }
+scoped-tls = { workspace = true }
+socket2 = { workspace = true, features = ["all"] }
 
 # Windows specific dependencies
 [target.'cfg(windows)'.dependencies]
@@ -52,19 +54,24 @@ windows-sys = { workspace = true, features = [
     "Win32_System_WindowsProgramming",
 ] }
 
-# Linux specific dependencies
+# Unix specific dependencies
-[target.'cfg(target_os = "linux")'.dependencies]
-io-uring = { version = "0.7.0", optional = true }
-polling = { version = "3.3.0", optional = true }
-
-# Other platform dependencies
-[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 }
+polling = { workspace = true }
+
+# Linux specific dependencies
+[target.'cfg(target_os = "linux")'.dependencies]
+io-uring = { workspace = true, optional = true }
+polling = { workspace = true, optional = true }
+
+# Other platform dependencies
+[target.'cfg(all(not(target_os = "linux"), unix))'.dependencies]
+polling = { workspace = true }
+
+[target.'cfg(windows)'.dev-dependencies]
+windows-sys = { workspace = true, features = ["Win32_UI_WindowsAndMessaging"] }
 
 [build-dependencies]
 cfg_aliases = { workspace = true }
@@ -72,10 +79,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/driver/key.rs

@@ -1,6 +1,6 @@
 use std::{io, marker::PhantomData, mem::MaybeUninit, pin::Pin, task::Waker};
 
-use crate::{OpCode, Overlapped, PushEntry, RawFd};
+use super::{OpCode, Overlapped, PushEntry, RawFd};
 
 /// An operation with other needed information. It should be allocated on the
 /// heap. The pointer to this struct is used as `user_data`, and on Windows, it

ntex-neon/src/driver/mod.rs

@@ -4,14 +4,14 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![allow(clippy::type_complexity)]
 
-#[cfg(all(
+// #[cfg(all(
-    target_os = "linux",
+//     target_os = "linux",
-    not(feature = "io-uring"),
+//     not(feature = "io-uring"),
-    not(feature = "polling")
+//     not(feature = "polling")
-))]
+// ))]
-compile_error!(
+// compile_error!(
-    "You must choose at least one of these features: [\"io-uring\", \"polling\"]"
+//     "You must choose at least one of these features: [\"io-uring\", \"polling\"]"
-);
+// );
 
 #[cfg(unix)]
 use std::{io, task::Poll, task::Waker, time::Duration};
@@ -134,14 +134,14 @@ macro_rules! syscall {
 #[doc(hidden)]
 macro_rules! impl_raw_fd {
     ($t:ty, $it:ty, $inner:ident) => {
-        impl $crate::AsRawFd for $t {
+        impl $crate::driver::AsRawFd for $t {
-            fn as_raw_fd(&self) -> $crate::RawFd {
+            fn as_raw_fd(&self) -> $crate::driver::RawFd {
                 self.$inner.as_raw_fd()
             }
         }
         #[cfg(unix)]
         impl std::os::fd::FromRawFd for $t {
-            unsafe fn from_raw_fd(fd: $crate::RawFd) -> Self {
+            unsafe fn from_raw_fd(fd: $crate::driver::RawFd) -> Self {
                 Self {
                     $inner: std::os::fd::FromRawFd::from_raw_fd(fd),
                 }

ntex-neon/src/driver/op.rs

@@ -7,9 +7,9 @@
 use std::{io, marker::PhantomPinned, mem::ManuallyDrop, net::Shutdown};
 
 #[cfg(unix)]
-pub use crate::sys::op::{CreateSocket, Interest};
+pub use super::sys::op::{CreateSocket, Interest};
 
-use crate::OwnedFd;
+use super::OwnedFd;
 
 pub trait Handler {
     /// Submitted interest

ntex-neon/src/driver/poll/mod.rs

@@ -8,7 +8,9 @@ use crossbeam_queue::SegQueue;
 use nohash_hasher::IntMap;
 use polling::{Event, Events, Poller};
 
-use crate::{op::Handler, op::Interest, AsyncifyPool, Entry, Key, ProactorBuilder};
+use crate::driver::{
+    op::Handler, op::Interest, sys, AsyncifyPool, Entry, Key, ProactorBuilder,
+};
 
 pub(crate) mod op;
 
@@ -228,7 +230,7 @@ impl Driver {
         self.handlers.set(Some(handlers));
     }
 
-    pub fn create_op<T: crate::sys::OpCode + 'static>(&self, op: T) -> Key<T> {
+    pub fn create_op<T: sys::OpCode + 'static>(&self, op: T) -> Key<T> {
         Key::new(self.as_raw_fd(), op)
     }
 
@@ -236,7 +238,7 @@ impl Driver {
         Ok(())
     }
 
-    pub fn push(&self, op: &mut Key<dyn crate::sys::OpCode>) -> Poll<io::Result<usize>> {
+    pub fn push(&self, op: &mut Key<dyn sys::OpCode>) -> Poll<io::Result<usize>> {
         let user_data = op.user_data();
         let op_pin = op.as_op_pin();
         match op_pin.pre_submit()? {
@@ -390,7 +392,7 @@ impl Driver {
         let poll = self.poll.clone();
         let completed = self.pool_completed.clone();
         let mut closure = move || {
-            let mut op = unsafe { Key::<dyn crate::sys::OpCode>::new_unchecked(user_data) };
+            let mut op = unsafe { Key::<dyn sys::OpCode>::new_unchecked(user_data) };
             let op_pin = op.as_op_pin();
             let res = match op_pin.operate() {
                 Poll::Pending => unreachable!("this operation is not non-blocking"),

ntex-neon/src/driver/poll/op.rs

@@ -1,9 +1,9 @@
 use std::{io, marker::Send, os::fd::FromRawFd, os::fd::RawFd, pin::Pin, task::Poll};
 
-pub use crate::unix::op::*;
+pub use crate::driver::unix::op::*;
 
 use super::{AsRawFd, Decision, OpCode};
-use crate::{op::*, syscall};
+use crate::{driver::op::*, syscall};
 
 impl<D, F> OpCode for Asyncify<F, D>
 where

ntex-neon/src/driver/unix/mod.rs

@@ -3,7 +3,7 @@
 
 pub(crate) mod op;
 
-use crate::RawFd;
+use crate::driver::RawFd;
 
 /// The overlapped struct for unix needn't contain extra fields.
 pub(crate) struct Overlapped;

ntex-neon/src/driver/unix/op.rs

@@ -1,6 +1,6 @@
 use std::net::Shutdown;
 
-use crate::op::*;
+use crate::driver::op::*;
 
 /// The interest to poll a file descriptor.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

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,11 @@
 #![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::{op::CloseSocket, op::ShutdownSocket, AsRawFd};
+use crate::{impl_raw_fd, syscall};
+
 #[derive(Debug)]
 pub struct Socket {
     socket: Socket2,
@@ -41,7 +43,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 +99,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 +120,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::{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::{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,
 };
@@ -85,14 +86,14 @@ impl Runtime {
     /// This method will panic if there are no running [`Runtime`].
     pub fn with_current<T, F: FnOnce(&Self) -> T>(f: F) -> T {
         #[cold]
-        fn not_in_ntex_runtime() -> ! {
+        fn not_in_neon_runtime() -> ! {
-            panic!("not in a ntex runtime")
+            panic!("not in a neon runtime")
         }
 
         if CURRENT_RUNTIME.is_set() {
             CURRENT_RUNTIME.with(f)
         } else {
-            not_in_ntex_runtime()
+            not_in_neon_runtime()
         }
     }
 

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-neon = { version = "0.1.0", optional = true }
-ntex-iodriver = { version = "0.1.0", optional = true }
 
 bitflags = { workspace = true }
 log = { workspace = true }

ntex-net/src/compat.rs

@@ -6,36 +6,24 @@ pub use ntex_tokio::{from_tcp_stream, tcp_connect, tcp_connect_in};
 #[cfg(all(unix, feature = "tokio"))]
 pub use ntex_tokio::{from_unix_stream, unix_connect, unix_connect_in};
 
-#[cfg(all(
+#[cfg(all(feature = "neon", not(feature = "tokio"), not(feature = "compio")))]
-    feature = "default-rt",
-    not(feature = "tokio"),
-    not(feature = "compio")
-))]
 pub use crate::rt::{
     from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
     unix_connect_in,
 };
 
-#[cfg(all(
+#[cfg(all(feature = "compio", not(feature = "tokio"), not(feature = "neon")))]
-    feature = "compio",
-    not(feature = "tokio"),
-    not(feature = "default-rt")
-))]
 pub use ntex_compio::{from_tcp_stream, tcp_connect, tcp_connect_in};
 
 #[cfg(all(
     unix,
     feature = "compio",
     not(feature = "tokio"),
-    not(feature = "default-rt")
+    not(feature = "neon")
 ))]
 pub use ntex_compio::{from_unix_stream, unix_connect, unix_connect_in};
 
-#[cfg(all(
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
 mod no_rt {
     use ntex_io::Io;
 
@@ -100,9 +88,5 @@ mod no_rt {
     }
 }
 
-#[cfg(all(
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
 pub use no_rt::*;

ntex-net/src/lib.rs

@@ -9,9 +9,5 @@ pub use ntex_rt::{spawn, spawn_blocking};
 
 pub use self::compat::*;
 
-#[cfg(all(
+#[cfg(all(feature = "neon", not(feature = "tokio"), not(feature = "compio")))]
-    feature = "default-rt",
-    not(feature = "tokio"),
-    not(feature = "compio")
-))]
 mod rt;

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_neon::driver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
+use ntex_neon::driver::{AsRawFd, DriverApi, RawFd};
-use ntex_runtime::net::{Socket, TcpStream, UnixStream};
+use ntex_neon::net::{Socket, TcpStream, UnixStream};
-use ntex_runtime::Runtime;
+use ntex_neon::{syscall, 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_neon::driver::op::{Handler, Interest};
-use ntex_iodriver::{syscall, AsRawFd, DriverApi, RawFd};
+use ntex_neon::driver::{AsRawFd, DriverApi, RawFd};
-use ntex_runtime::Runtime;
+use ntex_neon::{syscall, Runtime};
 use slab::Slab;
 
 use ntex_bytes::BufMut;

ntex-net/src/rt/io.rs

@@ -3,7 +3,7 @@ use std::{any, future::poll_fn, io, task::Poll};
 use ntex_io::{
     types, Handle, IoContext, IoStream, ReadContext, ReadStatus, WriteContext, WriteStatus,
 };
-use ntex_runtime::{net::TcpStream, net::UnixStream, spawn};
+use ntex_neon::{net::TcpStream, net::UnixStream, spawn};
 
 use super::driver::{Closable, CompioOps, StreamCtl};
 

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> {
@@ -47,14 +47,14 @@ where
 /// Convert std TcpStream to tokio's TcpStream
 pub fn from_tcp_stream(stream: net::TcpStream) -> Result<Io> {
     stream.set_nodelay(true)?;
-    Ok(Io::new(TcpStream(ntex_runtime::net::TcpStream::from_std(
+    Ok(Io::new(TcpStream(ntex_neon::net::TcpStream::from_std(
         stream,
     )?)))
 }
 
 /// Convert std UnixStream to tokio's UnixStream
 pub fn from_unix_stream(stream: std::os::unix::net::UnixStream) -> Result<Io> {
-    Ok(Io::new(UnixStream(
+    Ok(Io::new(UnixStream(ntex_neon::net::UnixStream::from_std(
-        ntex_runtime::net::UnixStream::from_std(stream)?,
+        stream,
-    )))
+    )?)))
 }

ntex-rt/Cargo.toml

@@ -26,8 +26,8 @@ tokio = ["tok-io"]
 # compio support
 compio = ["compio-driver", "compio-runtime"]
 
-# default ntex runtime
+# neon runtime
-default-rt = ["ntex-runtime", "ntex-iodriver"]
+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-neon = { version = "0.1", optional = true }
-ntex-iodriver = { 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

@@ -248,19 +248,19 @@ mod compio {
 }
 
 #[allow(dead_code)]
-#[cfg(feature = "default-rt")]
+#[cfg(feature = "neon")]
-mod default_rt {
+mod neon {
     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> {
@@ -408,15 +408,11 @@ pub use self::tokio::*;
 #[cfg(feature = "compio")]
 pub use self::compio::*;
 
-#[cfg(feature = "default-rt")]
+#[cfg(feature = "neon")]
-pub use self::default_rt::*;
+pub use self::neon::*;
 
 #[allow(dead_code)]
-#[cfg(all(
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
 mod no_rt {
     use std::task::{Context, Poll};
     use std::{fmt, future::Future, marker::PhantomData, pin::Pin};
@@ -475,9 +471,5 @@ mod no_rt {
     impl std::error::Error for JoinError {}
 }
 
-#[cfg(all(
+#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
-    not(feature = "tokio"),
-    not(feature = "compio"),
-    not(feature = "default-rt")
-))]
 pub use self::no_rt::*;

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
+# neon runtime
-default-rt = ["ntex-net/default-rt"]
+neon = ["ntex-net/neon"]
 
 # websocket support
 ws = ["dep:sha-1"]