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

Do not rely on not_ready(), always check service readiness (#459)

Browse source
This commit is contained in:
Nikolay Kim 2024-11-05 15:35:34 +05:00 • committed by GitHub
parent 9bf6f3111d
commit 0a376457f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 29 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.8.2] - 2024-11-05
* Do not rely on not_ready(), always check service readiness
## [2.8.1] - 2024-11-04
* Periodically check readiness

2
ntex-io/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-io"
version = "2.8.1"
version = "2.8.2"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Utilities for encoding and decoding frames"
keywords = ["network", "framework", "async", "futures"]

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

@ -11,8 +11,6 @@ use crate::{Decoded, DispatchItem, IoBoxed, IoStatusUpdate, RecvError};
type Response<U> = <U as Encoder>::Item;
const READY_COUNT: u8 = 32;
#[derive(Clone, Debug)]
/// Shared dispatcher configuration
pub struct DispatcherConfig(Rc<DispatcherConfigInner>);
@ -148,7 +146,6 @@ where
shared: Rc<DispatcherShared<S, U>>,
response: Option<PipelineCall<S, DispatchItem<U>>>,
cfg: DispatcherConfig,
ready_count: u8,
read_remains: u32,
read_remains_prev: u32,
read_max_timeout: Seconds,
@ -235,7 +232,6 @@ where
cfg: cfg.clone(),
response: None,
error: None,
ready_count: 0,
read_remains: 0,
read_remains_prev: 0,
read_max_timeout: Seconds::ZERO,
@ -475,21 +471,10 @@ where
}
fn poll_service(&mut self, cx: &mut Context<'_>) -> Poll<PollService<U>> {
// check service readiness
if self.flags.contains(Flags::READY) {
if self.ready_count != 0 && self.shared.service.poll_not_ready(cx).is_pending()
{
self.ready_count -= 1;
return Poll::Ready(self.check_error());
}
self.flags.remove(Flags::READY);
}
// wait until service becomes ready
match self.shared.service.poll_ready(cx) {
Poll::Ready(Ok(_)) => {
self.ready_count = READY_COUNT;
self.flags.insert(Flags::READY);
let _ = self.shared.service.poll_not_ready(cx);
Poll::Ready(self.check_error())
}
// pause io read task
@ -738,7 +723,6 @@ mod tests {
error: None,
st: DispatcherState::Processing,
response: None,
ready_count: 0,
read_remains: 0,
read_remains_prev: 0,
read_max_timeout: Seconds::ZERO,