From cfc32ed74fd3d90479043d349c841b9eef70e850 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Thu, 13 Mar 2025 16:17:19 +0500 Subject: [PATCH] Update neon apis (#520) --- Cargo.toml | 2 ++ ntex-net/Cargo.toml | 2 +- ntex-net/src/rt_polling/connect.rs | 2 +- ntex-net/src/rt_polling/driver.rs | 8 +++----- ntex-net/src/rt_uring/connect.rs | 2 +- ntex-net/src/rt_uring/driver.rs | 2 +- ntex-rt/Cargo.toml | 4 ++-- ntex-rt/src/lib.rs | 20 ++++++-------------- 8 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 871d9de2..1224f10f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,6 +45,8 @@ ntex-util = { path = "ntex-util" } ntex-compio = { path = "ntex-compio" } ntex-tokio = { path = "ntex-tokio" } +ntex-neon = { git = "https://github.com/ntex-rs/neon.git" } + [workspace.dependencies] async-task = "4.5.0" bitflags = "2" diff --git a/ntex-net/Cargo.toml b/ntex-net/Cargo.toml index 3ec61e56..7f13d373 100644 --- a/ntex-net/Cargo.toml +++ b/ntex-net/Cargo.toml @@ -40,7 +40,7 @@ ntex-util = "2.5" ntex-tokio = { version = "0.5.3", optional = true } ntex-compio = { version = "0.2.4", optional = true } -ntex-neon = { version = "0.1.0", optional = true } +ntex-neon = { version = "0.1.1", optional = true } bitflags = { workspace = true } cfg-if = { workspace = true } diff --git a/ntex-net/src/rt_polling/connect.rs b/ntex-net/src/rt_polling/connect.rs index 8e4e3275..140004ba 100644 --- a/ntex-net/src/rt_polling/connect.rs +++ b/ntex-net/src/rt_polling/connect.rs @@ -95,7 +95,7 @@ impl ConnectOps { s } else { let mut inner = None; - rt.driver().register_handler(|api| { + rt.driver().register(|api| { let ops = Rc::new(ConnectOpsInner { api, connects: RefCell::new(Slab::new()), diff --git a/ntex-net/src/rt_polling/driver.rs b/ntex-net/src/rt_polling/driver.rs index 7c36064b..423d1d71 100644 --- a/ntex-net/src/rt_polling/driver.rs +++ b/ntex-net/src/rt_polling/driver.rs @@ -1,6 +1,6 @@ use std::{cell::Cell, collections::VecDeque, io, rc::Rc, task, task::Poll}; -use ntex_neon::driver::op::{CloseSocket, Handler, Interest}; +use ntex_neon::driver::op::{close_socket, Handler, Interest}; use ntex_neon::driver::{AsRawFd, DriverApi, RawFd}; use ntex_neon::{syscall, Runtime}; use slab::Slab; @@ -57,7 +57,7 @@ impl StreamOps { s } else { let mut inner = None; - rt.driver().register_handler(|api| { + rt.driver().register(|api| { let ops = Rc::new(StreamOpsInner { api, feed: Cell::new(Some(VecDeque::new())), @@ -216,10 +216,8 @@ impl StreamCtl { let (io, fd) = self.with(|streams| (streams[self.id].io.take(), streams[self.id].fd)); if let Some(io) = io { - let op = CloseSocket::from_raw_fd(fd); - let fut = ntex_neon::submit(op); std::mem::forget(io); - fut.await.0?; + close_socket(fd).await?; } Ok(()) } diff --git a/ntex-net/src/rt_uring/connect.rs b/ntex-net/src/rt_uring/connect.rs index 3b58910e..eba482ad 100644 --- a/ntex-net/src/rt_uring/connect.rs +++ b/ntex-net/src/rt_uring/connect.rs @@ -90,7 +90,7 @@ impl ConnectOps { s } else { let mut inner = None; - rt.driver().register_handler(|api| { + rt.driver().register(|api| { let ops = Rc::new(ConnectOpsInner { api, ops: RefCell::new(Slab::new()), diff --git a/ntex-net/src/rt_uring/driver.rs b/ntex-net/src/rt_uring/driver.rs index e3a9f0f1..e6aeef85 100644 --- a/ntex-net/src/rt_uring/driver.rs +++ b/ntex-net/src/rt_uring/driver.rs @@ -64,7 +64,7 @@ impl StreamOps { s } else { let mut inner = None; - rt.driver().register_handler(|api| { + rt.driver().register(|api| { let mut ops = Slab::new(); ops.insert(Operation::Nop); diff --git a/ntex-rt/Cargo.toml b/ntex-rt/Cargo.toml index e8ff8910..0526e450 100644 --- a/ntex-rt/Cargo.toml +++ b/ntex-rt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-rt" -version = "0.4.27" +version = "0.4.28" authors = ["ntex contributors "] description = "ntex runtime" keywords = ["network", "framework", "async", "futures"] @@ -42,7 +42,7 @@ tok-io = { version = "1", package = "tokio", default-features = false, features "net", ], optional = true } -ntex-neon = { version = "0.1", optional = true } +ntex-neon = { version = "0.1.1", optional = true } [dev-dependencies] env_logger = "0.11" diff --git a/ntex-rt/src/lib.rs b/ntex-rt/src/lib.rs index 37715f2e..1ffd7fe7 100644 --- a/ntex-rt/src/lib.rs +++ b/ntex-rt/src/lib.rs @@ -258,11 +258,12 @@ mod neon { /// Runs the provided future, blocking the current thread until the future /// completes. pub fn block_on>(fut: F) { + let rt = Runtime::new().unwrap(); log::info!( "Starting neon runtime, driver {:?}", - ntex_neon::driver::DriverType::current() + rt.driver().tp().name() ); - let rt = Runtime::new().unwrap(); + rt.block_on(fut); } @@ -376,17 +377,7 @@ mod neon { impl JoinHandle { pub fn is_finished(&self) -> bool { - if let Some(hnd) = &self.fut { - hnd.is_finished() - } else { - true - } - } - } - - impl Drop for JoinHandle { - fn drop(&mut self) { - self.fut.take().unwrap().detach(); + false } } @@ -396,7 +387,8 @@ mod neon { fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { Poll::Ready( ready!(Pin::new(self.fut.as_mut().unwrap()).poll(cx)) - .map_err(|_| JoinError), + .map_err(|_| JoinError) + .and_then(|result| result.map_err(|_| JoinError)), ) } }