Optimize read task

ntex-tokio/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.1] - 2023-11-12
+
+* Optimize io read task
+
 ## [0.3.0] - 2023-06-22
 
 * Release v0.3.0

ntex-tokio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-tokio"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "tokio intergration for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -16,9 +16,9 @@ name = "ntex_tokio"
 path = "src/lib.rs"
 
 [dependencies]
-ntex-bytes = "0.1.19"
-ntex-io = "0.3.0"
-ntex-util = "0.3.0"
+ntex-bytes = "0.1.21"
+ntex-io = "0.3.6"
+ntex-util = "0.3.4"
 log = "0.4"
 pin-project-lite = "0.2"
 tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }

ntex-tokio/src/io.rs

@@ -54,9 +54,9 @@ impl Future for ReadTask {
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.as_ref();
 
-        this.state.with_buf(|buf, hw, lw| {
-            match ready!(this.state.poll_ready(cx)) {
-                ReadStatus::Ready => {
+        match ready!(this.state.poll_ready(cx)) {
+            ReadStatus::Ready => {
+                this.state.with_buf(|buf, hw, lw| {
                     // read data from socket
                     let mut io = this.io.borrow_mut();
                     loop {
@@ -83,13 +83,13 @@ impl Future for ReadTask {
                             }
                         };
                     }
-                }
-                ReadStatus::Terminate => {
-                    log::trace!("read task is instructed to shutdown");
-                    Poll::Ready(Ok(()))
-                }
+                })
             }
-        })
+            ReadStatus::Terminate => {
+                log::trace!("read task is instructed to shutdown");
+                Poll::Ready(())
+            }
+        }
     }
 }