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

Rename runtime to neon (#513)

Browse source
This commit is contained in:
Nikolay Kim 2025-03-10 12:06:13 +05:00 • committed by GitHub
parent 8ffa646af7
commit 4e77e9ce24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 113 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ntex-rt/Cargo.toml
View file

@ -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 }

2
ntex-rt/build.rs
View file

@ -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,
};
}

32
ntex-rt/src/lib.rs
View file

@ -248,19 +248,19 @@ mod compio {
}
#[allow(dead_code)]
#[cfg(feature = "default-rt")]
mod default_rt {
#[cfg(feature = "neon")]
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")]
pub use self::default_rt::*;
#[cfg(feature = "neon")]
pub use self::neon::*;
#[allow(dead_code)]
#[cfg(all(
not(feature = "tokio"),
not(feature = "compio"),
not(feature = "default-rt")
))]
#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
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(
not(feature = "tokio"),
not(feature = "compio"),
not(feature = "default-rt")
))]
#[cfg(all(not(feature = "tokio"), not(feature = "compio"), not(feature = "neon")))]
pub use self::no_rt::*;