mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-03 21:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor uring feature (#518)

Browse source
This commit is contained in:
Nikolay Kim 2025-03-12 15:12:28 +05:00 • committed by GitHub
parent db16b71c5f
commit 12afaa00ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 125 additions and 3001 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ntex-net/Cargo.toml
View file

@ -25,10 +25,10 @@ tokio = ["ntex-rt/tokio", "ntex-tokio"]
compio = ["ntex-rt/compio", "ntex-compio"]
# neon runtime
neon = ["ntex-rt/neon", "ntex-neon/polling", "slab", "socket2"]
neon = ["ntex-rt/neon", "ntex-neon", "slab", "socket2"]
# neon io-uring runtime
neon-uring = ["ntex-rt/neon", "ntex-neon/io-uring", "io-uring", "slab", "socket2"]
polling = ["ntex-neon/polling", "dep:polling"]
io-uring = ["ntex-neon/io-uring", "dep:io-uring"]
[dependencies]
ntex-service = "3.3"
@ -43,15 +43,17 @@ ntex-compio = { version = "0.2.4", optional = true }
ntex-neon = { version = "0.1.0", optional = true }
bitflags = { workspace = true }
cfg-if = { workspace = true }
log = { workspace = true }
libc = { workspace = true }
thiserror = { workspace = true }
slab = { workspace = true, optional = true }
socket2 = { workspace = true, optional = true }
thiserror = { workspace = true }
# Linux specific dependencies
[target.'cfg(target_os = "linux")'.dependencies]
io-uring = { workspace = true, optional = true }
polling = { workspace = true, optional = true }
[dev-dependencies]
ntex = "2"

46
ntex-net/src/compat.rs
View file

@ -6,51 +6,18 @@ 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(
feature = "neon",
not(feature = "neon-uring"),
not(feature = "tokio"),
not(feature = "compio")
))]
pub use crate::rt_polling::{
from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
unix_connect_in,
};
#[cfg(all(
feature = "neon-uring",
not(feature = "neon"),
not(feature = "tokio"),
not(feature = "compio")
))]
pub use crate::rt_uring::{
from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
unix_connect_in,
};
#[cfg(all(
feature = "compio",
not(feature = "tokio"),
not(feature = "neon"),
not(feature = "neon-uring")
))]
#[cfg(all(feature = "compio", not(feature = "tokio"), not(feature = "neon")))]
pub use ntex_compio::{from_tcp_stream, tcp_connect, tcp_connect_in};
#[cfg(all(
unix,
feature = "compio",
not(feature = "tokio"),
not(feature = "neon"),
not(feature = "neon-uring")
not(feature = "neon")
))]
pub use ntex_compio::{from_unix_stream, unix_connect, unix_connect_in};
#[cfg(all(
not(feature = "tokio"),
not(feature = "compio"),
not(feature = "neon"),
not(feature = "neon-uring")
))]
#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
mod no_rt {
use ntex_io::Io;
@ -115,10 +82,5 @@ mod no_rt {
}
}
#[cfg(all(
not(feature = "tokio"),
not(feature = "compio"),
not(feature = "neon"),
not(feature = "neon-uring")
))]
#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
pub use no_rt::*;

36
ntex-net/src/lib.rs
View file

@ -8,20 +8,22 @@ pub mod connect;
pub use ntex_io::Io;
pub use ntex_rt::{spawn, spawn_blocking};
pub use self::compat::*;
#[cfg(all(
feature = "neon",
not(feature = "neon-uring"),
not(feature = "tokio"),
not(feature = "compio")
))]
mod rt_polling;
#[cfg(all(
feature = "neon-uring",
not(feature = "neon"),
not(feature = "tokio"),
not(feature = "compio")
))]
mod rt_uring;
cfg_if::cfg_if! {
if #[cfg(all(feature = "neon", target_os = "linux", feature = "io-uring"))] {
#[path = "rt_uring/mod.rs"]
mod rt_impl;
pub use self::rt_impl::{
from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
unix_connect_in,
};
} else if #[cfg(all(unix, feature = "neon"))] {
#[path = "rt_polling/mod.rs"]
mod rt_impl;
pub use self::rt_impl::{
from_tcp_stream, from_unix_stream, tcp_connect, tcp_connect_in, unix_connect,
unix_connect_in,
};
} else {
pub use self::compat::*;
}
}

3
ntex-net/src/rt_uring/driver.rs
View file

@ -1,8 +1,7 @@
use std::{cell::RefCell, fmt, io, mem, num::NonZeroU32, rc::Rc, task::Poll};
use io_uring::{opcode, squeue::Entry, types::Fd};
use ntex_neon::driver::op::Handler;
use ntex_neon::driver::{AsRawFd, DriverApi};
use ntex_neon::driver::{op::Handler, AsRawFd, DriverApi};
use ntex_neon::Runtime;
use ntex_util::channel::oneshot;
use slab::Slab;