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

Added Service::poll() method (#481)

Browse source
This commit is contained in:
Nikolay Kim 2024-12-04 13:33:20 +05:00 • committed by GitHub
parent 80d20e4371
commit e33149df1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 229 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-io/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [2.9.0] - 2024-12-04
* Use updated Service trait
## [2.8.3] - 2024-11-10
* Check service readiness once per decoded item

6
ntex-io/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-io"
version = "2.8.3"
version = "2.9.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Utilities for encoding and decoding frames"
keywords = ["network", "framework", "async", "futures"]
@ -18,8 +18,8 @@ path = "src/lib.rs"
[dependencies]
ntex-codec = "0.6"
ntex-bytes = "0.1"
ntex-util = "2.5"
ntex-service = "3.3.3"
ntex-util = "2.8"
ntex-service = "3.4"
ntex-rt = "0.4"
bitflags = "2"

35
ntex-io/src/dispatcher.rs
View file

@ -1,7 +1,7 @@
//! Framed transport dispatcher
#![allow(clippy::let_underscore_future)]
use std::task::{ready, Context, Poll};
use std::{cell::Cell, future::poll_fn, future::Future, pin::Pin, rc::Rc};
use std::{cell::Cell, future::Future, pin::Pin, rc::Rc};
use ntex_codec::{Decoder, Encoder};
use ntex_service::{IntoService, Pipeline, PipelineBinding, PipelineCall, Service};
@ -131,7 +131,6 @@ bitflags::bitflags! {
const KA_ENABLED = 0b0000100;
const KA_TIMEOUT = 0b0001000;
const READ_TIMEOUT = 0b0010000;
const READY_TASK = 0b1000000;
}
}
@ -284,12 +283,6 @@ where
}
}
// ready task
if slf.flags.contains(Flags::READY_TASK) {
slf.flags.insert(Flags::READY_TASK);
ntex_rt::spawn(not_ready(slf.shared.clone()));
}
loop {
match slf.st {
DispatcherState::Processing => {
@ -628,30 +621,6 @@ where
}
}
async fn not_ready<S, U>(slf: Rc<DispatcherShared<S, U>>)
where
S: Service<DispatchItem<U>, Response = Option<Response<U>>> + 'static,
U: Encoder + Decoder + 'static,
{
let pl = slf.service.clone();
loop {
if !pl.is_shutdown() {
if let Err(err) = poll_fn(|cx| pl.poll_ready(cx)).await {
log::trace!("{}: Service readiness check failed, stopping", slf.io.tag());
slf.error.set(Some(DispatcherError::Service(err)));
break;
}
if !pl.is_shutdown() {
poll_fn(|cx| pl.poll_not_ready(cx)).await;
slf.ready.set(false);
slf.io.wake();
continue;
}
}
break;
}
}
#[cfg(test)]
mod tests {
use std::sync::{atomic::AtomicBool, atomic::Ordering::Relaxed, Arc, Mutex};
@ -902,8 +871,6 @@ mod tests {
Err("test")
}
async fn not_ready(&self) {}
async fn call(
&self,
_: DispatchItem<BytesCodec>,