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

Rename keep-alive flag

Browse source
This commit is contained in:
Nikolay Kim 2023-11-13 14:44:20 +06:00
parent 41045de766
commit f07c0576a7
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,11 +43,11 @@ bitflags::bitflags! {
/// dispatcher is marked stopped /// dispatcher is marked stopped
const DSP_STOP = 0b0001_0000_0000_0000; const DSP_STOP = 0b0001_0000_0000_0000;
/// keep-alive timeout occured /// timeout occured
const DSP_KEEPALIVE = 0b0010_0000_0000_0000; const DSP_TIMEOUT = 0b0010_0000_0000_0000;
/// keep-alive timeout started /// timer started
const KEEPALIVE = 0b1000_0000_0000_0000; const TIMEOUT = 0b1000_0000_0000_0000;
} }
} }
@ -92,12 +92,12 @@ impl IoState {
} }
pub(super) fn notify_timeout(&self) { pub(super) fn notify_timeout(&self) {
log::trace!("keep-alive timeout, notify dispatcher"); log::trace!("timeout, notify dispatcher");
let mut flags = self.flags.get(); let mut flags = self.flags.get();
flags.remove(Flags::KEEPALIVE); flags.remove(Flags::TIMEOUT);
if !flags.contains(Flags::DSP_KEEPALIVE) { if !flags.contains(Flags::DSP_TIMEOUT) {
flags.insert(Flags::DSP_KEEPALIVE); flags.insert(Flags::DSP_TIMEOUT);
self.flags.set(flags); self.flags.set(flags);
self.dispatch_task.wake(); self.dispatch_task.wake();
} }
@ -348,7 +348,7 @@ impl<F> Io<F> {
Ok(item) => Ok(Some(item)), Ok(item) => Ok(Some(item)),
Err(RecvError::KeepAlive) => Err(Either::Right(io::Error::new( Err(RecvError::KeepAlive) => Err(Either::Right(io::Error::new(
io::ErrorKind::TimedOut, io::ErrorKind::TimedOut,
"Keep-alive", "Timeout",
))), ))),
Err(RecvError::Stop) => Err(Either::Right(io::Error::new( Err(RecvError::Stop) => Err(Either::Right(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
@ -552,8 +552,8 @@ impl<F> Io<F> {
} else if flags.contains(Flags::DSP_STOP) { } else if flags.contains(Flags::DSP_STOP) {
self.0 .0.remove_flags(Flags::DSP_STOP); self.0 .0.remove_flags(Flags::DSP_STOP);
Err(RecvError::Stop) Err(RecvError::Stop)
} else if flags.contains(Flags::DSP_KEEPALIVE) { } else if flags.contains(Flags::DSP_TIMEOUT) {
self.0 .0.remove_flags(Flags::DSP_KEEPALIVE); self.0 .0.remove_flags(Flags::DSP_TIMEOUT);
Err(RecvError::KeepAlive) Err(RecvError::KeepAlive)
} else if flags.contains(Flags::WR_BACKPRESSURE) { } else if flags.contains(Flags::WR_BACKPRESSURE) {
Err(RecvError::WriteBackpressure) Err(RecvError::WriteBackpressure)
@ -645,8 +645,8 @@ impl<F> Io<F> {
} else if flags.contains(Flags::DSP_STOP) { } else if flags.contains(Flags::DSP_STOP) {
self.0 .0.remove_flags(Flags::DSP_STOP); self.0 .0.remove_flags(Flags::DSP_STOP);
Poll::Ready(IoStatusUpdate::Stop) Poll::Ready(IoStatusUpdate::Stop)
} else if flags.contains(Flags::DSP_KEEPALIVE) { } else if flags.contains(Flags::DSP_TIMEOUT) {
self.0 .0.remove_flags(Flags::DSP_KEEPALIVE); self.0 .0.remove_flags(Flags::DSP_TIMEOUT);
Poll::Ready(IoStatusUpdate::KeepAlive) Poll::Ready(IoStatusUpdate::KeepAlive)
} else if flags.contains(Flags::WR_BACKPRESSURE) { } else if flags.contains(Flags::WR_BACKPRESSURE) {
Poll::Ready(IoStatusUpdate::WriteBackpressure) Poll::Ready(IoStatusUpdate::WriteBackpressure)
@ -940,7 +940,7 @@ mod tests {
server.0 .0.notify_timeout(); server.0 .0.notify_timeout();
let err = server.recv(&BytesCodec).await.err().unwrap(); let err = server.recv(&BytesCodec).await.err().unwrap();
assert!(format!("{:?}", err).contains("Keep-alive")); assert!(format!("{:?}", err).contains("Timeout"));
server.0 .0.insert_flags(Flags::DSP_STOP); server.0 .0.insert_flags(Flags::DSP_STOP);
let err = server.recv(&BytesCodec).await.err().unwrap(); let err = server.recv(&BytesCodec).await.err().unwrap();

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

@ -206,7 +206,7 @@ impl IoRef {
} }
#[inline] #[inline]
/// Keep-alive deadline /// current timer deadline
pub fn timer_deadline(&self) -> time::Instant { pub fn timer_deadline(&self) -> time::Instant {
self.0.keepalive.get() self.0.keepalive.get()
} }
@ -214,23 +214,23 @@ impl IoRef {
#[inline] #[inline]
/// Start timer /// Start timer
pub fn start_timer(&self, timeout: time::Duration) { pub fn start_timer(&self, timeout: time::Duration) {
if self.flags().contains(Flags::KEEPALIVE) { if self.flags().contains(Flags::TIMEOUT) {
timer::unregister(self.0.keepalive.get(), self); timer::unregister(self.0.keepalive.get(), self);
} }
if !timeout.is_zero() { if !timeout.is_zero() {
log::debug!("start keep-alive timeout {:?}", timeout); log::debug!("start timer {:?}", timeout);
self.0.insert_flags(Flags::KEEPALIVE); self.0.insert_flags(Flags::TIMEOUT);
self.0.keepalive.set(timer::register(timeout, self)); self.0.keepalive.set(timer::register(timeout, self));
} else { } else {
self.0.remove_flags(Flags::KEEPALIVE); self.0.remove_flags(Flags::TIMEOUT);
} }
} }
#[inline] #[inline]
/// Stop keep-alive timer /// Stop timer
pub fn stop_timer(&self) { pub fn stop_timer(&self) {
if self.flags().contains(Flags::KEEPALIVE) { if self.flags().contains(Flags::TIMEOUT) {
log::debug!("unregister keep-alive timer"); log::debug!("unregister timer");
timer::unregister(self.0.keepalive.get(), self) timer::unregister(self.0.keepalive.get(), self)
} }
} }