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

Drop glommio support (#511)

Browse source
This commit is contained in:
Nikolay Kim 2025-03-09 18:19:34 +05:00 • committed by GitHub
parent 4c1bc3249b
commit 59ffd17b91
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 31 additions and 608 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ntex-rt/CHANGES.md
View file

@ -1,5 +1,11 @@
# Changes
## [0.4.25] - 2025-03-10
* Add "ntex-runtime" support
* Drop glommio support
## [0.4.24] - 2025-01-03
* Relax runtime requirements

7
ntex-rt/Cargo.toml
View file

@ -20,9 +20,6 @@ path = "src/lib.rs"
[features]
default = []
# glommio support
glommio = ["glomm-io", "futures-channel"]
# tokio support
tokio = ["tok-io"]
@ -51,7 +48,3 @@ tok-io = { version = "1", package = "tokio", default-features = false, features
ntex-runtime = { version = "0.1", optional = true }
ntex-iodriver = { version = "0.1", optional = true }
[target.'cfg(target_os = "linux")'.dependencies]
glomm-io = { version = "0.9", package = "glommio", optional = true }
futures-channel = { version = "0.3", optional = true }

1
ntex-rt/build.rs
View file

@ -7,7 +7,6 @@ fn main() {
let _ = match key.as_ref() {
"CARGO_FEATURE_COMPIO" => features.insert("compio"),
"CARGO_FEATURE_TOKIO" => features.insert("tokio"),
"CARGO_FEATURE_GLOMMIO" => features.insert("glommio"),
"CARGO_FEATURE_ASYNC_STD" => features.insert("async-std"),
"CARGO_FEATURE_DEFAULT_RT" => features.insert("default-rt"),
_ => false,

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

@ -502,129 +502,12 @@ mod asyncstd {
}
}
#[allow(dead_code)]
#[cfg(all(feature = "glommio", target_os = "linux"))]
mod glommio {
use std::future::{poll_fn, Future};
use std::{pin::Pin, task::Context, task::Poll};
use futures_channel::oneshot::Canceled;
use glomm_io::task;
pub type JoinError = Canceled;
/// Runs the provided future, blocking the current thread until the future
/// completes.
pub fn block_on<F: Future<Output = ()>>(fut: F) {
let ex = glomm_io::LocalExecutor::default();
ex.run(async move {
let _ = fut.await;
})
}
/// Spawn a future on the current thread. This does not create a new Arbiter
/// or Arbiter address, it is simply a helper for spawning futures on the current
/// thread.
///
/// # Panics
///
/// This function panics if ntex system is not running.
#[inline]
pub fn spawn<F>(mut f: F) -> JoinHandle<F::Output>
where
F: Future + 'static,
F::Output: 'static,
{
let ptr = crate::CB.with(|cb| (cb.borrow().0)());
JoinHandle {
fut: Either::Left(
glomm_io::spawn_local(async move {
if let Some(ptr) = ptr {
glomm_io::executor().yield_now().await;
let mut f = unsafe { Pin::new_unchecked(&mut f) };
let result = poll_fn(|ctx| {
let new_ptr = crate::CB.with(|cb| (cb.borrow().1)(ptr));
let result = f.as_mut().poll(ctx);
crate::CB.with(|cb| (cb.borrow().2)(new_ptr));
result
})
.await;
crate::CB.with(|cb| (cb.borrow().3)(ptr));
result
} else {
glomm_io::executor().yield_now().await;
f.await
}
})
.detach(),
),
}
}
/// Executes a future on the current thread. This does not create a new Arbiter
/// or Arbiter address, it is simply a helper for executing futures on the current
/// thread.
///
/// # Panics
///
/// This function panics if ntex system is not running.
#[inline]
pub fn spawn_fn<F, R>(f: F) -> JoinHandle<R::Output>
where
F: FnOnce() -> R + 'static,
R: Future + 'static,
{
spawn(async move { f().await })
}
pub fn spawn_blocking<F, R>(f: F) -> JoinHandle<R>
where
F: FnOnce() -> R + Send + 'static,
R: Send + 'static,
{
let fut = glomm_io::executor().spawn_blocking(f);
JoinHandle {
fut: Either::Right(Box::pin(async move { Ok(fut.await) })),
}
}
enum Either<T1, T2> {
Left(T1),
Right(T2),
}
/// Blocking operation completion future. It resolves with results
/// of blocking function execution.
#[allow(clippy::type_complexity)]
pub struct JoinHandle<T> {
fut:
Either<task::JoinHandle<T>, Pin<Box<dyn Future<Output = Result<T, Canceled>>>>>,
}
impl<T> Future for JoinHandle<T> {
type Output = Result<T, Canceled>;
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
match self.fut {
Either::Left(ref mut f) => match Pin::new(f).poll(cx) {
Poll::Pending => Poll::Pending,
Poll::Ready(res) => Poll::Ready(res.ok_or(Canceled)),
},
Either::Right(ref mut f) => Pin::new(f).poll(cx),
}
}
}
}
#[cfg(feature = "tokio")]
pub use self::tokio::*;
#[cfg(feature = "async-std")]
pub use self::asyncstd::*;
#[cfg(feature = "glommio")]
pub use self::glommio::*;
#[cfg(feature = "compio")]
pub use self::compio::*;
@ -636,8 +519,7 @@ pub use self::default_rt::*;
not(feature = "tokio"),
not(feature = "async-std"),
not(feature = "compio"),
not(feature = "default-rt"),
not(feature = "glommio")
not(feature = "default-rt")
))]
mod no_rt {
use std::task::{Context, Poll};
@ -701,7 +583,6 @@ mod no_rt {
not(feature = "tokio"),
not(feature = "async-std"),
not(feature = "compio"),
not(feature = "default-rt"),
not(feature = "glommio")
not(feature = "default-rt")
))]
pub use self::no_rt::*;