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

Fix operation cancelation handling for poll driver

Browse source
This commit is contained in:
Nikolay Kim 2025-03-14 23:39:47 +05:00
parent a83ed4c3fa
commit ff028c393b
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-net/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [2.5.3] - 2025-03-14
* Fix operation cancelation handling for poll driver
## [2.5.2] - 2025-03-14 ## [2.5.2] - 2025-03-14
* Fix operation cancelation handling for io-uring driver * Fix operation cancelation handling for io-uring driver

2
ntex-net/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-net" name = "ntex-net"
version = "2.5.2" version = "2.5.3"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "ntexwork utils for ntex framework" description = "ntexwork utils for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]

31
ntex-net/src/rt_polling/driver.rs
View file

@ -193,14 +193,17 @@ impl<T> Handler for StreamOpsHandler<T> {
let mut feed = self.inner.feed.take().unwrap(); let mut feed = self.inner.feed.take().unwrap();
for id in feed.drain(..) { for id in feed.drain(..) {
let item = &mut streams[id]; let item = &mut streams[id];
log::debug!("{}: Drop io ({}), {:?}", item.context.tag(), id, item.fd);
item.ref_count -= 1; item.ref_count -= 1;
if item.ref_count == 0 { if item.ref_count == 0 {
let item = streams.remove(id); let item = streams.remove(id);
if item.io.is_some() { log::debug!(
self.inner.api.unregister_all(item.fd); "{}: Drop io ({}), {:?}, has-io: {}",
} item.context.tag(),
id,
item.fd,
item.io.is_some()
);
self.inner.api.unregister_all(item.fd);
} }
} }
@ -350,19 +353,17 @@ impl<T> Clone for StreamCtl<T> {
impl<T> Drop for StreamCtl<T> { impl<T> Drop for StreamCtl<T> {
fn drop(&mut self) { fn drop(&mut self) {
if let Some(mut streams) = self.inner.streams.take() { if let Some(mut streams) = self.inner.streams.take() {
log::debug!(
"{}: Drop io ({}), {:?}",
streams[self.id].context.tag(),
self.id,
streams[self.id].fd
);
streams[self.id].ref_count -= 1; streams[self.id].ref_count -= 1;
if streams[self.id].ref_count == 0 { if streams[self.id].ref_count == 0 {
let item = streams.remove(self.id); let item = streams.remove(self.id);
if item.io.is_some() { log::debug!(
self.inner.api.unregister_all(item.fd); "{}: Drop io ({}), {:?}, has-io: {}",
} item.context.tag(),
self.id,
item.fd,
item.io.is_some()
);
self.inner.api.unregister_all(item.fd);
} }
self.inner.streams.set(Some(streams)); self.inner.streams.set(Some(streams));
} else { } else {