From 8f4eb4e6bbb595939b65f0e323e380588a7dbde2 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 21 Dec 2021 01:39:48 +0600 Subject: [PATCH] rename write_ready to flush --- ntex-io/CHANGES.md | 6 ++++++ ntex-io/Cargo.toml | 2 +- ntex-io/src/io.rs | 36 +++++++++++++++++++++++---------- ntex-io/src/tokio_impl.rs | 8 ++++---- ntex-tls/src/openssl/mod.rs | 2 +- ntex/Cargo.toml | 2 +- ntex/src/http/client/h1proto.rs | 4 ++-- ntex/src/server/mod.rs | 6 ++++++ 8 files changed, 46 insertions(+), 20 deletions(-) diff --git a/ntex-io/CHANGES.md b/ntex-io/CHANGES.md index 42f3a9ba..e884f0af 100644 --- a/ntex-io/CHANGES.md +++ b/ntex-io/CHANGES.md @@ -1,5 +1,11 @@ # Changes +## [0.1.0-b.3] - 2021-12-xx + +* Rename .poll_write_ready() to .poll_flush() + +* Rename .write_ready() to .flush() + ## [0.1.0-b.2] - 2021-12-20 * Removed `WriteRef` and `ReadRef` diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml index 70e4238c..501ced00 100644 --- a/ntex-io/Cargo.toml +++ b/ntex-io/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-io" -version = "0.1.0-b.2" +version = "0.1.0-b.3" authors = ["ntex contributors "] description = "Utilities for encoding and decoding frames" keywords = ["network", "framework", "async", "futures"] diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs index 03de15c4..ef393245 100644 --- a/ntex-io/src/io.rs +++ b/ntex-io/src/io.rs @@ -408,18 +408,25 @@ impl Io { self.0 .0.write_task.wake(); } - poll_fn(|cx| self.poll_write_ready(cx, true)) + poll_fn(|cx| self.poll_flush(cx, true)) .await .map_err(Either::Right)?; Ok(()) } #[inline] - /// Wake write task and instruct to write data. + /// Wake write task and instruct to flush data. /// - /// This is async version of .poll_write_ready() method. + /// This is async version of .poll_flush() method. + pub async fn flush(&self, full: bool) -> Result<(), io::Error> { + poll_fn(|cx| self.poll_flush(cx, full)).await + } + + #[doc(hidden)] + #[deprecated] + #[inline] pub async fn write_ready(&self, full: bool) -> Result<(), io::Error> { - poll_fn(|cx| self.poll_write_ready(cx, full)).await + poll_fn(|cx| self.poll_flush(cx, full)).await } #[inline] @@ -431,16 +438,12 @@ impl Io { impl Io { #[inline] - /// Wake write task and instruct to write data. + /// Wake write task and instruct to flush data. /// - /// If full is true then wake up dispatcher when all data is flushed + /// If `full` is true then wake up dispatcher when all data is flushed /// otherwise wake up when size of write buffer is lower than /// buffer max size. - pub fn poll_write_ready( - &self, - cx: &mut Context<'_>, - full: bool, - ) -> Poll> { + pub fn poll_flush(&self, cx: &mut Context<'_>, full: bool) -> Poll> { // check io error if !self.0 .0.is_io_open() { return Poll::Ready(Err(self.0 .0.error.take().unwrap_or_else(|| { @@ -470,6 +473,17 @@ impl Io { Poll::Ready(Ok(())) } + #[doc(hidden)] + #[deprecated] + #[inline] + pub fn poll_write_ready( + &self, + cx: &mut Context<'_>, + full: bool, + ) -> Poll> { + self.poll_flush(cx, full) + } + #[inline] /// Wake read task and instruct to read more data /// diff --git a/ntex-io/src/tokio_impl.rs b/ntex-io/src/tokio_impl.rs index a385fe87..e7d44b3a 100644 --- a/ntex-io/src/tokio_impl.rs +++ b/ntex-io/src/tokio_impl.rs @@ -383,7 +383,7 @@ impl AsyncWrite for Io { } fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { - self.poll_write_ready(cx, false) + Io::poll_flush(&*self, cx, false) } fn poll_shutdown( @@ -428,7 +428,7 @@ impl AsyncWrite for IoBoxed { } fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { - self.poll_write_ready(cx, false) + Self::poll_flush(&*self, cx, false) } fn poll_shutdown( @@ -648,8 +648,8 @@ mod unixstream { } Poll::Ready(Err(e)) => { log::trace!( - "write task is closed with err during shutdown" - ); + "write task is closed with err during shutdown" + ); this.state.close(Some(e)); return Poll::Ready(()); } diff --git a/ntex-tls/src/openssl/mod.rs b/ntex-tls/src/openssl/mod.rs index fe8ff94e..58d44249 100644 --- a/ntex-tls/src/openssl/mod.rs +++ b/ntex-tls/src/openssl/mod.rs @@ -350,7 +350,7 @@ fn handle_result( Poll::Pending } ssl::ErrorCode::WANT_WRITE => { - let _ = io.poll_write_ready(cx, true)?; + let _ = io.poll_flush(cx, true)?; Poll::Pending } _ => Poll::Ready(Err(Box::new(e))), diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index 07090041..19e77cf4 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -46,7 +46,7 @@ ntex-macros = "0.1.3" ntex-util = "0.1.3" ntex-bytes = "0.1.8" ntex-tls = "=0.1.0-b.1" -ntex-io = "=0.1.0-b.2" +ntex-io = "=0.1.0-b.3" ntex-rt = { version = "0.4.0-b.0", default-features = false, features = ["tokio"] } base64 = "0.13" diff --git a/ntex/src/http/client/h1proto.rs b/ntex/src/http/client/h1proto.rs index 6d3a3fd3..7e2ac336 100644 --- a/ntex/src/http/client/h1proto.rs +++ b/ntex/src/http/client/h1proto.rs @@ -128,7 +128,7 @@ where match poll_fn(|cx| body.poll_next_chunk(cx)).await { Some(result) => { if !io.encode(h1::Message::Chunk(Some(result?)), codec)? { - io.write_ready(false).await?; + io.flush(false).await?; } } None => { @@ -137,7 +137,7 @@ where } } } - io.write_ready(true).await?; + io.flush(true).await?; Ok(()) } diff --git a/ntex/src/server/mod.rs b/ntex/src/server/mod.rs index d4ada6f4..3bc91124 100644 --- a/ntex/src/server/mod.rs +++ b/ntex/src/server/mod.rs @@ -12,6 +12,12 @@ mod socket; mod test; mod worker; +#[cfg(feature = "openssl")] +pub use ntex_tls::openssl; + +#[cfg(feature = "rustls")] +pub use ntex_tls::rustls; + pub(crate) use self::builder::create_tcp_listener; pub use self::builder::ServerBuilder; pub use self::config::{Configuration, RuntimeConfiguration, ServiceConfig};