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

IoRef::close() method initiates io stream shutdown

Browse source
This commit is contained in:
Nikolay Kim 2021-12-29 23:30:33 +06:00
parent dc17d00ed9
commit a2623cdc29
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-io/CHANGES.md
View file

@ -2,6 +2,10 @@
## [0.1.0-b.10] - 2021-12-30
* IoRef::close() method initiates io stream shutdown
* IoRef::force_close() method terminates io stream
* Cleanup Filter trait, removed closed,want_read,want_shutdown methods
* Cleanup internal flags on io error

15
ntex-io/src/io.rs
View file

@ -133,6 +133,7 @@ impl IoState {
self.read_task.wake();
self.write_task.wake();
self.dispatch_task.wake();
self.shutdown_filters();
}
}
@ -153,7 +154,19 @@ impl IoState {
Poll::Ready(Err(err)) => {
self.io_stopped(Some(err));
}
Poll::Pending => (),
Poll::Pending => {
let flags = self.flags.get();
// check read buffer, if buffer is not consumed it is unlikely
// that filter will properly complete shutdown
if flags.contains(Flags::RD_PAUSED)
|| flags.contains(Flags::RD_BUF_FULL | Flags::RD_READY)
{
self.read_task.wake();
self.write_task.wake();
self.dispatch_task.wake();
self.insert_flags(Flags::IO_STOPPING);
}
}
}
}
}

14
ntex-io/src/ioref.rs
View file

@ -77,19 +77,25 @@ impl IoRef {
#[inline]
/// Gracefully close connection
///
/// First stop dispatcher, then dispatcher stops io tasks
/// Notify dispatcher and initiate io stream shutdown process
pub fn close(&self) {
self.0.insert_flags(Flags::DSP_STOP);
self.0.dispatch_task.wake();
self.0.init_shutdown(None);
}
#[inline]
/// Force close connection
///
/// Dispatcher does not wait for uncompleted responses, but flushes io buffers.
/// Dispatcher does not wait for uncompleted responses. Io stream get terminated
/// without any graceful period.
pub fn force_close(&self) {
log::trace!("force close io stream object");
self.0.insert_flags(Flags::DSP_STOP | Flags::IO_STOPPING);
self.0.insert_flags(
Flags::DSP_STOP
| Flags::IO_STOPPED
| Flags::IO_STOPPING
| Flags::IO_STOPPING_FILTERS,
);
self.0.read_task.wake();
self.0.write_task.wake();
self.0.dispatch_task.wake();