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

Prepare io release

Browse source
This commit is contained in:
Nikolay Kim 2024-01-09 21:10:26 +06:00
parent c864b10e62
commit 587b248b57
13 changed files with 121 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ntex-async-std/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-async-std" name = "ntex-async-std"
version = "0.4.0-b.0" version = "0.4.0"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "async-std intergration for ntex framework" description = "async-std intergration for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -17,8 +17,8 @@ path = "src/lib.rs"
[dependencies] [dependencies]
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-io = "1.0.0-b.1" ntex-io = "1.0.0"
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"
log = "0.4" log = "0.4"
pin-project-lite = "0.2" pin-project-lite = "0.2"
async-std = { version = "1", features = ["unstable"] } async-std = { version = "1", features = ["unstable"] }

2
ntex-connect/Cargo.toml
View file

@ -37,7 +37,7 @@ async-std = ["ntex-rt/async-std", "ntex-async-std"]
ntex-service = "2.0.0" ntex-service = "2.0.0"
ntex-io = "1.0.0-b.1" ntex-io = "1.0.0-b.1"
ntex-tls = "1.0.0-b.1" ntex-tls = "1.0.0-b.1"
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-http = "0.1" ntex-http = "0.1"
ntex-rt = "0.4.7" ntex-rt = "0.4.7"

6
ntex-glommio/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-glommio" name = "ntex-glommio"
version = "0.4.0-b.0" version = "0.4.0"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "glommio intergration for ntex framework" description = "glommio intergration for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -17,8 +17,8 @@ path = "src/lib.rs"
[dependencies] [dependencies]
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-io = "1.0.0-b.0" ntex-io = "1.0.0"
ntex-util = "1.0.0-b.0" ntex-util = "1.0.0"
futures-lite = "1.12" futures-lite = "1.12"
log = "0.4" log = "0.4"
oneshot = { version = "0.1", default-features = false, features = ["async"] } oneshot = { version = "0.1", default-features = false, features = ["async"] }

6
ntex-io/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-io" name = "ntex-io"
version = "1.0.0-b.1" version = "1.0.0"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "Utilities for encoding and decoding frames" description = "Utilities for encoding and decoding frames"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -18,7 +18,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
ntex-codec = "0.6.2" ntex-codec = "0.6.2"
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"
ntex-service = "2.0.0" ntex-service = "2.0.0"
bitflags = "2.4" bitflags = "2.4"
@ -29,4 +29,4 @@ pin-project-lite = "0.2"
rand = "0.8" rand = "0.8"
env_logger = "0.10" env_logger = "0.10"
ntex = { version = "1.0.0-b.0", features = ["tokio"] } ntex = { version = "1.0.0-b.1", features = ["tokio"] }

12
ntex-io/src/tasks.rs
View file

@ -13,6 +13,12 @@ impl ReadContext {
Self(io.clone()) Self(io.clone())
} }
#[inline]
/// Io tag
pub fn tag(&self) -> &'static str {
self.0.tag()
}
#[inline] #[inline]
/// Check readiness for read operations /// Check readiness for read operations
pub fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<ReadStatus> { pub fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<ReadStatus> {
@ -127,6 +133,12 @@ impl WriteContext {
Self(io.clone()) Self(io.clone())
} }
#[inline]
/// Io tag
pub fn tag(&self) -> &'static str {
self.0.tag()
}
#[inline] #[inline]
/// Return memory pool for this context /// Return memory pool for this context
pub fn memory_pool(&self) -> PoolRef { pub fn memory_pool(&self) -> PoolRef {

2
ntex-service/Cargo.toml
View file

@ -20,4 +20,4 @@ slab = "0.4"
[dev-dependencies] [dev-dependencies]
ntex = { version = "1.0.0-b.0", features = ["tokio"] } ntex = { version = "1.0.0-b.0", features = ["tokio"] }
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"

2
ntex-tls/Cargo.toml
View file

@ -27,7 +27,7 @@ rustls = ["tls_rust"]
[dependencies] [dependencies]
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-io = "1.0.0-b.1" ntex-io = "1.0.0-b.1"
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"
ntex-service = "2.0.0" ntex-service = "2.0.0"
log = "0.4" log = "0.4"
pin-project-lite = "0.2" pin-project-lite = "0.2"

4
ntex-tls/src/lib.rs
View file

@ -3,10 +3,6 @@
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
#[doc(hidden)]
#[deprecated]
pub mod types;
#[cfg(feature = "openssl")] #[cfg(feature = "openssl")]
pub mod openssl; pub mod openssl;

1
ntex-tls/src/types.rs
View file

@ -1 +0,0 @@
pub use ntex_io::types::HttpProtocol;

4
ntex-tokio/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.4.0] - 2024-01-09
* Log io tags
## [0.4.0-b.0] - 2024-01-07 ## [0.4.0-b.0] - 2024-01-07
* Use "async fn" in trait for Service definition * Use "async fn" in trait for Service definition

6
ntex-tokio/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-tokio" name = "ntex-tokio"
version = "0.4.0-b.0" version = "0.4.0"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "tokio intergration for ntex framework" description = "tokio intergration for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -17,8 +17,8 @@ path = "src/lib.rs"
[dependencies] [dependencies]
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-io = "1.0.0-b.1" ntex-io = "1.0.0"
ntex-util = "1.0.0-b.1" ntex-util = "1.0.0"
log = "0.4" log = "0.4"
pin-project-lite = "0.2" pin-project-lite = "0.2"
tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] } tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }

116
ntex-tokio/src/io.rs
View file

@ -69,7 +69,10 @@ impl Future for ReadTask {
Poll::Pending => Poll::Pending, Poll::Pending => Poll::Pending,
Poll::Ready(Ok(n)) => { Poll::Ready(Ok(n)) => {
if n == 0 { if n == 0 {
log::trace!("tcp stream is disconnected"); log::trace!(
"{}: Tcp stream is disconnected",
this.state.tag()
);
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
} else if buf.len() < hw { } else if buf.len() < hw {
continue; continue;
@ -78,7 +81,11 @@ impl Future for ReadTask {
} }
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!("read task failed on io {:?}", err); log::trace!(
"{}: Read task failed on io {:?}",
this.state.tag(),
err
);
Poll::Ready(Err(err)) Poll::Ready(Err(err))
} }
}; };
@ -86,7 +93,7 @@ impl Future for ReadTask {
}) })
} }
ReadStatus::Terminate => { ReadStatus::Terminate => {
log::trace!("read task is instructed to shutdown"); log::trace!("{}: Read task is instructed to shutdown", this.state.tag());
Poll::Ready(()) Poll::Ready(())
} }
} }
@ -148,7 +155,8 @@ impl Future for WriteTask {
match ready!(this.state.with_buf(|buf| flush_io( match ready!(this.state.with_buf(|buf| flush_io(
&mut *this.io.borrow_mut(), &mut *this.io.borrow_mut(),
buf, buf,
cx cx,
&this.state
))) { ))) {
Ok(()) => Poll::Pending, Ok(()) => Poll::Pending,
Err(e) => { Err(e) => {
@ -158,14 +166,21 @@ impl Future for WriteTask {
} }
} }
WriteStatus::Timeout(time) => { WriteStatus::Timeout(time) => {
log::trace!("initiate timeout delay for {:?}", time); log::trace!(
"{}: Initiate timeout delay for {:?}",
this.state.tag(),
time
);
if delay.is_none() { if delay.is_none() {
*delay = Some(sleep(time)); *delay = Some(sleep(time));
} }
self.poll(cx) self.poll(cx)
} }
WriteStatus::Shutdown(time) => { WriteStatus::Shutdown(time) => {
log::trace!("write task is instructed to shutdown"); log::trace!(
"{}: Write task is instructed to shutdown",
this.state.tag()
);
let timeout = if let Some(delay) = delay.take() { let timeout = if let Some(delay) = delay.take() {
delay delay
@ -177,7 +192,10 @@ impl Future for WriteTask {
self.poll(cx) self.poll(cx)
} }
WriteStatus::Terminate => { WriteStatus::Terminate => {
log::trace!("write task is instructed to terminate"); log::trace!(
"{}: Write task is instructed to terminate",
this.state.tag()
);
if !matches!( if !matches!(
this.io.borrow().linger(), this.io.borrow().linger(),
@ -201,14 +219,17 @@ impl Future for WriteTask {
Shutdown::None => { Shutdown::None => {
// flush write buffer // flush write buffer
let mut io = this.io.borrow_mut(); let mut io = this.io.borrow_mut();
match this.state.with_buf(|buf| flush_io(&mut *io, buf, cx)) { match this
.state
.with_buf(|buf| flush_io(&mut *io, buf, cx, &this.state))
{
Poll::Ready(Ok(())) => { Poll::Ready(Ok(())) => {
*st = Shutdown::Flushed; *st = Shutdown::Flushed;
continue; continue;
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!( log::trace!(
"write task is closed with err during flush, {:?}", "{}: Write task is closed with err during flush, {:?}", this.state.tag(),
err err
); );
this.state.close(Some(err)); this.state.close(Some(err));
@ -226,7 +247,8 @@ impl Future for WriteTask {
} }
Poll::Ready(Err(e)) => { Poll::Ready(Err(e)) => {
log::trace!( log::trace!(
"write task is closed with err during shutdown" "{}: Write task is closed with err during shutdown",
this.state.tag()
); );
this.state.close(Some(e)); this.state.close(Some(e));
return Poll::Ready(()); return Poll::Ready(());
@ -246,13 +268,16 @@ impl Future for WriteTask {
if read_buf.filled().is_empty() => if read_buf.filled().is_empty() =>
{ {
this.state.close(None); this.state.close(None);
log::trace!("tokio write task is stopped"); log::trace!(
"{}: Tokio write task is stopped",
this.state.tag()
);
return Poll::Ready(()); return Poll::Ready(());
} }
Poll::Pending => { Poll::Pending => {
*count += read_buf.filled().len() as u16; *count += read_buf.filled().len() as u16;
if *count > 4096 { if *count > 4096 {
log::trace!("tokio write task is stopped, too much input"); log::trace!("{}: Tokio write task is stopped, too much input", this.state.tag());
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
} }
@ -268,7 +293,7 @@ impl Future for WriteTask {
if delay.poll_elapsed(cx).is_pending() { if delay.poll_elapsed(cx).is_pending() {
return Poll::Pending; return Poll::Pending;
} }
log::trace!("write task is stopped after delay"); log::trace!("{}: Write task is stopped after delay", this.state.tag());
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
} }
@ -282,19 +307,24 @@ pub(super) fn flush_io<T: AsyncRead + AsyncWrite + Unpin>(
io: &mut T, io: &mut T,
buf: &mut Option<BytesVec>, buf: &mut Option<BytesVec>,
cx: &mut Context<'_>, cx: &mut Context<'_>,
st: &WriteContext,
) -> Poll<io::Result<()>> { ) -> Poll<io::Result<()>> {
if let Some(buf) = buf { if let Some(buf) = buf {
let len = buf.len(); let len = buf.len();
if len != 0 { if len != 0 {
// log::trace!("flushing framed transport: {:?}", buf.len()); // log::trace!("{}: Flushing framed transport: {:?}", st.tag(), buf.len());
let mut written = 0; let mut written = 0;
let result = loop { let result = loop {
break match Pin::new(&mut *io).poll_write(cx, &buf[written..]) { break match Pin::new(&mut *io).poll_write(cx, &buf[written..]) {
Poll::Ready(Ok(n)) => { Poll::Ready(Ok(n)) => {
if n == 0 { if n == 0 {
log::trace!("Disconnected during flush, written {}", written); log::trace!(
"{}: Disconnected during flush, written {}",
st.tag(),
written
);
Poll::Ready(Err(io::Error::new( Poll::Ready(Err(io::Error::new(
io::ErrorKind::WriteZero, io::ErrorKind::WriteZero,
"failed to write frame to transport", "failed to write frame to transport",
@ -315,12 +345,12 @@ pub(super) fn flush_io<T: AsyncRead + AsyncWrite + Unpin>(
Poll::Pending Poll::Pending
} }
Poll::Ready(Err(e)) => { Poll::Ready(Err(e)) => {
log::trace!("Error during flush: {}", e); log::trace!("{}: Error during flush: {}", st.tag(), e);
Poll::Ready(Err(e)) Poll::Ready(Err(e))
} }
}; };
}; };
// log::trace!("flushed {} bytes", written); // log::trace!("{}: flushed {} bytes", st.tag(), written);
// flush // flush
return if written > 0 { return if written > 0 {
@ -328,7 +358,7 @@ pub(super) fn flush_io<T: AsyncRead + AsyncWrite + Unpin>(
Poll::Ready(Ok(_)) => result, Poll::Ready(Ok(_)) => result,
Poll::Pending => Poll::Pending, Poll::Pending => Poll::Pending,
Poll::Ready(Err(e)) => { Poll::Ready(Err(e)) => {
log::trace!("error during flush: {}", e); log::trace!("{}: Error during flush: {}", st.tag(), e);
Poll::Ready(Err(e)) Poll::Ready(Err(e))
} }
} }
@ -476,7 +506,10 @@ mod unixstream {
Poll::Pending => Poll::Pending, Poll::Pending => Poll::Pending,
Poll::Ready(Ok(n)) => { Poll::Ready(Ok(n)) => {
if n == 0 { if n == 0 {
log::trace!("tokio unix stream is disconnected"); log::trace!(
"{}: Tokio unix stream is disconnected",
this.state.tag()
);
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
} else if buf.len() < hw { } else if buf.len() < hw {
continue; continue;
@ -485,14 +518,21 @@ mod unixstream {
} }
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!("unix stream read task failed {:?}", err); log::trace!(
"{}: Unix stream read task failed {:?}",
this.state.tag(),
err
);
Poll::Ready(Err(err)) Poll::Ready(Err(err))
} }
}; };
} }
} }
ReadStatus::Terminate => { ReadStatus::Terminate => {
log::trace!("read task is instructed to shutdown"); log::trace!(
"{}: Read task is instructed to shutdown",
this.state.tag()
);
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
} }
} }
@ -542,7 +582,8 @@ mod unixstream {
match ready!(this.state.with_buf(|buf| flush_io( match ready!(this.state.with_buf(|buf| flush_io(
&mut *this.io.borrow_mut(), &mut *this.io.borrow_mut(),
buf, buf,
cx cx,
&this.state
))) { ))) {
Ok(()) => Poll::Pending, Ok(()) => Poll::Pending,
Err(e) => { Err(e) => {
@ -558,7 +599,10 @@ mod unixstream {
self.poll(cx) self.poll(cx)
} }
Poll::Ready(WriteStatus::Shutdown(time)) => { Poll::Ready(WriteStatus::Shutdown(time)) => {
log::trace!("write task is instructed to shutdown"); log::trace!(
"{}: Write task is instructed to shutdown",
this.state.tag()
);
let timeout = if let Some(delay) = delay.take() { let timeout = if let Some(delay) = delay.take() {
delay delay
@ -570,7 +614,10 @@ mod unixstream {
self.poll(cx) self.poll(cx)
} }
Poll::Ready(WriteStatus::Terminate) => { Poll::Ready(WriteStatus::Terminate) => {
log::trace!("write task is instructed to terminate"); log::trace!(
"{}: Write task is instructed to terminate",
this.state.tag()
);
let _ = Pin::new(&mut *this.io.borrow_mut()).poll_shutdown(cx); let _ = Pin::new(&mut *this.io.borrow_mut()).poll_shutdown(cx);
this.state.close(None); this.state.close(None);
@ -587,15 +634,16 @@ mod unixstream {
Shutdown::None => { Shutdown::None => {
// flush write buffer // flush write buffer
let mut io = this.io.borrow_mut(); let mut io = this.io.borrow_mut();
match this.state.with_buf(|buf| flush_io(&mut *io, buf, cx)) match this.state.with_buf(|buf| {
{ flush_io(&mut *io, buf, cx, &this.state)
}) {
Poll::Ready(Ok(())) => { Poll::Ready(Ok(())) => {
*st = Shutdown::Flushed; *st = Shutdown::Flushed;
continue; continue;
} }
Poll::Ready(Err(err)) => { Poll::Ready(Err(err)) => {
log::trace!( log::trace!(
"write task is closed with err during flush, {:?}", "{}: Write task is closed with err during flush, {:?}", this.state.tag(),
err err
); );
this.state.close(Some(err)); this.state.close(Some(err));
@ -614,7 +662,7 @@ mod unixstream {
} }
Poll::Ready(Err(e)) => { Poll::Ready(Err(e)) => {
log::trace!( log::trace!(
"write task is closed with err during shutdown" "{}: Write task is closed with err during shutdown", this.state.tag()
); );
this.state.close(Some(e)); this.state.close(Some(e));
return Poll::Ready(()); return Poll::Ready(());
@ -634,14 +682,17 @@ mod unixstream {
if read_buf.filled().is_empty() => if read_buf.filled().is_empty() =>
{ {
this.state.close(None); this.state.close(None);
log::trace!("write task is stopped"); log::trace!(
"{}: Write task is stopped",
this.state.tag()
);
return Poll::Ready(()); return Poll::Ready(());
} }
Poll::Pending => { Poll::Pending => {
*count += read_buf.filled().len() as u16; *count += read_buf.filled().len() as u16;
if *count > 4096 { if *count > 4096 {
log::trace!( log::trace!(
"write task is stopped, too much input" "{}: Write task is stopped, too much input", this.state.tag()
); );
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
@ -658,7 +709,10 @@ mod unixstream {
if delay.poll_elapsed(cx).is_pending() { if delay.poll_elapsed(cx).is_pending() {
return Poll::Pending; return Poll::Pending;
} }
log::trace!("write task is stopped after delay"); log::trace!(
"{}: Write task is stopped after delay",
this.state.tag()
);
this.state.close(None); this.state.close(None);
return Poll::Ready(()); return Poll::Ready(());
} }

10
ntex/Cargo.toml
View file

@ -54,15 +54,15 @@ ntex-http = "0.1.11"
ntex-router = "0.5.2" ntex-router = "0.5.2"
ntex-service = "2.0.0" ntex-service = "2.0.0"
ntex-macros = "0.1.3" ntex-macros = "0.1.3"
ntex-util = "1.0.0-b.0" ntex-util = "1.0.0"
ntex-bytes = "0.1.21" ntex-bytes = "0.1.21"
ntex-h2 = "0.5.0-b.0" ntex-h2 = "0.5.0-b.0"
ntex-rt = "0.4.11" ntex-rt = "0.4.11"
ntex-io = "1.0.0-b.1" ntex-io = "1.0.0"
ntex-tls = "1.0.0-b.1" ntex-tls = "1.0.0-b.1"
ntex-tokio = { version = "0.4.0-b.0", optional = true } ntex-tokio = { version = "0.4.0", optional = true }
ntex-glommio = { version = "0.4.0-b.0", optional = true } ntex-glommio = { version = "0.4.0", optional = true }
ntex-async-std = { version = "0.4.0-b.0", optional = true } ntex-async-std = { version = "0.4.0", optional = true }
async-channel = "2.1" async-channel = "2.1"
base64 = "0.21" base64 = "0.21"