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

Handle io errors

Browse source
This commit is contained in:
Nikolay Kim 2025-03-28 19:06:56 +01:00
parent e4f24ee41f
commit f04c48e28d
1 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,8 @@ bitflags::bitflags! {
struct Flags: u8 { struct Flags: u8 {
const RD = 0b0000_0001; const RD = 0b0000_0001;
const WR = 0b0000_0010; const WR = 0b0000_0010;
const CLOSED = 0b0000_0100; const ERROR = 0b0000_0100;
const CLOSED = 0b0000_1000;
} }
} }
@ -116,7 +117,7 @@ impl<T> Handler for StreamOpsHandler<T> {
if ev.is_interrupt() { if ev.is_interrupt() {
item.context.stopped(None); item.context.stopped(None);
if item.io.take().is_some() { if item.io.take().is_some() {
close(id as u32, item, &self.inner.api); close(id as u32, item, &self.inner.api, true);
} }
return; return;
} }
@ -178,7 +179,7 @@ impl<T> Handler for StreamOpsHandler<T> {
item.io.is_some() item.io.is_some()
); );
if item.io.is_some() { if item.io.is_some() {
close(id, &mut item, &self.inner.api); close(id, &mut item, &self.inner.api, false);
} }
} }
} }
@ -190,16 +191,19 @@ impl<T> Handler for StreamOpsHandler<T> {
fn error(&mut self, id: usize, err: io::Error) { fn error(&mut self, id: usize, err: io::Error) {
self.inner.with(|streams| { self.inner.with(|streams| {
if let Some(item) = streams.get_mut(id) { if let Some(item) = streams.get_mut(id) {
log::debug!( if !item.flags.contains(Flags::ERROR) {
"{}: FD is failed ({}) {:?}, err: {:?}", log::debug!(
item.tag(), "{}: FD is failed ({}) {:?}, err: {:?}",
id, item.tag(),
item.fd, id,
err item.fd,
); err
item.context.stopped(Some(err)); );
if item.io.take().is_some() { item.flags.insert(Flags::ERROR);
close(id as u32, item, &self.inner.api); item.context.stopped(Some(err));
if item.io.take().is_some() {
close(id as u32, item, &self.inner.api, true);
}
} }
} }
}) })
@ -222,14 +226,21 @@ fn close<T>(
id: u32, id: u32,
item: &mut StreamItem<T>, item: &mut StreamItem<T>,
api: &DriverApi, api: &DriverApi,
) -> ntex_rt::JoinHandle<io::Result<i32>> { error: bool,
let fd = item.fd; ) -> Option<ntex_rt::JoinHandle<io::Result<i32>>> {
item.flags.insert(Flags::CLOSED); if !item.flags.contains(Flags::CLOSED) {
api.detach(fd, id); let fd = item.fd;
ntex_rt::spawn_blocking(move || { item.flags.insert(Flags::CLOSED);
syscall!(libc::shutdown(fd, libc::SHUT_RDWR))?; api.detach(fd, id);
syscall!(libc::close(fd)) Some(ntex_rt::spawn_blocking(move || {
}) if !error {
syscall!(libc::shutdown(fd, libc::SHUT_RDWR))?;
}
syscall!(libc::close(fd))
}))
} else {
None
}
} }
impl<T> StreamCtl<T> { impl<T> StreamCtl<T> {
@ -240,13 +251,13 @@ impl<T> StreamCtl<T> {
if let Some(io) = item.io.take() { if let Some(io) = item.io.take() {
log::debug!("{}: Closing ({}), {:?}", item.tag(), id, item.fd); log::debug!("{}: Closing ({}), {:?}", item.tag(), id, item.fd);
std::mem::forget(io); std::mem::forget(io);
Some(close(self.id, item, &self.inner.api)) Some(close(self.id, item, &self.inner.api, false))
} else { } else {
None None
} }
}); });
async move { async move {
if let Some(fut) = fut { if let Some(Some(fut)) = fut {
fut.await fut.await
.map_err(|e| io::Error::new(io::ErrorKind::Other, e)) .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
.and_then(crate::helpers::pool_io_err)?; .and_then(crate::helpers::pool_io_err)?;
@ -361,7 +372,7 @@ impl<T> Drop for StreamCtl<T> {
item.io.is_some() item.io.is_some()
); );
if item.io.is_some() { if item.io.is_some() {
close(self.id, &mut item, &self.inner.api); close(self.id, &mut item, &self.inner.api, true);
} }
} }
self.inner.streams.set(Some(streams)); self.inner.streams.set(Some(streams));