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

Depend on individual compio packages (#479)

Browse source
This commit is contained in:
Nikolay Kim 2024-12-02 15:00:50 +05:00 • committed by GitHub
parent a7666e4881
commit b5a4a3cb5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-rt/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [0.4.22] - 2024-12-01
* Depend on individual compio packages
## [0.4.21] - 2024-11-25
* Update to compio 0.13

9
ntex-rt/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-rt"
version = "0.4.21"
version = "0.4.22"
authors = ["ntex contributors <team@ntex.rs>"]
description = "ntex runtime"
keywords = ["network", "framework", "async", "futures"]
@ -27,7 +27,7 @@ glommio = ["glomm-io", "futures-channel"]
tokio = ["tok-io"]
# compio support
compio = ["comp-io"]
compio = ["compio-driver", "compio-runtime"]
# async-std support
async-std = ["async_std/unstable"]
@ -39,9 +39,8 @@ log = "0.4"
oneshot = "0.1"
async_std = { version = "1", package = "async-std", optional = true }
comp-io = { version = "0.13", package = "compio", default-features = false, features = [
"runtime"
], optional = true }
compio-driver = { version = "0.6", optional = true }
compio-runtime = { version = "0.6", optional = true }
tok-io = { version = "1", package = "tokio", default-features = false, features = [
"rt",
"net",

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

@ -127,14 +127,14 @@ mod compio {
use std::task::{ready, Context, Poll};
use std::{fmt, future::poll_fn, future::Future, pin::Pin};
use comp_io::runtime::Runtime;
use compio_runtime::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 {:?}",
comp_io::driver::DriverType::current()
compio_driver::DriverType::current()
);
let rt = Runtime::new().unwrap();
rt.block_on(fut);
@ -151,7 +151,7 @@ mod compio {
T: Send + 'static,
{
JoinHandle {
fut: Some(comp_io::runtime::spawn_blocking(f)),
fut: Some(compio_runtime::spawn_blocking(f)),
}
}
@ -168,7 +168,7 @@ mod compio {
F: Future + 'static,
{
let ptr = crate::CB.with(|cb| (cb.borrow().0)());
let fut = comp_io::runtime::spawn(async move {
let fut = compio_runtime::spawn(async move {
if let Some(ptr) = ptr {
let mut f = std::pin::pin!(f);
let result = poll_fn(|ctx| {
@ -216,7 +216,7 @@ mod compio {
impl std::error::Error for JoinError {}
pub struct JoinHandle<T> {
fut: Option<comp_io::runtime::JoinHandle<T>>,
fut: Option<compio_runtime::JoinHandle<T>>,
}
impl<T> JoinHandle<T> {