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

Update doc

Browse source
This commit is contained in:
Nikolay Kim 2023-11-02 16:18:57 +06:00
parent e4c58fa363
commit ea26d9ef53
4 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-io/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.3.4] - 2023-11-xx
## [0.3.3] - 2023-09-11 ## [0.3.3] - 2023-09-11
* Add missing fmt::Debug impls * Add missing fmt::Debug impls

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

@ -375,7 +375,7 @@ impl<F> Io<F> {
} }
#[inline] #[inline]
/// Encode item, send to a peer /// Encode item, send to the peer. Fully flush write buffer.
pub async fn send<U>( pub async fn send<U>(
&self, &self,
item: U::Item, item: U::Item,
@ -856,6 +856,7 @@ impl Future for OnDisconnect {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use ntex_codec::BytesCodec; use ntex_codec::BytesCodec;
use ntex_bytes::Bytes;
use super::*; use super::*;
use crate::testing::IoTest; use crate::testing::IoTest;
@ -881,4 +882,17 @@ mod tests {
let item = server.recv(&BytesCodec).await.ok().unwrap().unwrap(); let item = server.recv(&BytesCodec).await.ok().unwrap().unwrap();
assert_eq!(item, "GET /test HTTP/1"); assert_eq!(item, "GET /test HTTP/1");
} }
#[ntex::test]
async fn test_send() {
let (client, server) = IoTest::create();
client.remote_buffer_cap(1024);
let server = Io::new(server);
assert!(server.eq(&server));
server.send(Bytes::from_static(b"GET /test HTTP/1"), &BytesCodec).await.ok().unwrap();
let item = client.read_any();
assert_eq!(item, "GET /test HTTP/1");
}
} }

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

@ -53,7 +53,7 @@ impl ReadContext {
} else { } else {
inner.insert_flags(Flags::RD_READY); inner.insert_flags(Flags::RD_READY);
} }
log::trace!("new {} bytes available, wakeup dispatcher", nbytes,); log::trace!("new {} bytes available, wakeup dispatcher", nbytes);
inner.dispatch_task.wake(); inner.dispatch_task.wake();
} else if buf_full { } else if buf_full {
// read task is paused because of read back-pressure // read task is paused because of read back-pressure
@ -134,16 +134,16 @@ impl WriteContext {
// if write buffer is smaller than high watermark value, turn off back-pressure // if write buffer is smaller than high watermark value, turn off back-pressure
let mut flags = inner.flags.get(); let mut flags = inner.flags.get();
let mut wake_dispatcher = false; if len == 0 {
if flags.contains(Flags::WR_BACKPRESSURE) if flags.intersects(Flags::WR_WAIT | Flags::WR_BACKPRESSURE) {
flags.remove(Flags::WR_WAIT | Flags::WR_BACKPRESSURE);
inner.dispatch_task.wake();
}
} else if flags.contains(Flags::WR_BACKPRESSURE)
&& len < inner.pool.get().write_params_high() << 1 && len < inner.pool.get().write_params_high() << 1
{ {
flags.remove(Flags::WR_BACKPRESSURE); flags.remove(Flags::WR_BACKPRESSURE);
wake_dispatcher = true; inner.dispatch_task.wake();
}
if flags.contains(Flags::WR_WAIT) && len == 0 {
flags.remove(Flags::WR_WAIT);
wake_dispatcher = true;
} }
match result { match result {
@ -153,10 +153,6 @@ impl WriteContext {
} }
inner.flags.set(flags); inner.flags.set(flags);
if wake_dispatcher {
inner.dispatch_task.wake();
}
result result
} }

4
ntex/Cargo.toml
View file

@ -54,7 +54,7 @@ ntex-http = "0.1.10"
ntex-router = "0.5.2" ntex-router = "0.5.2"
ntex-service = "1.2.6" ntex-service = "1.2.6"
ntex-macros = "0.1.3" ntex-macros = "0.1.3"
ntex-util = "0.3.2" ntex-util = "0.3.3"
ntex-bytes = "0.1.19" ntex-bytes = "0.1.19"
ntex-h2 = "0.4.3" ntex-h2 = "0.4.3"
ntex-rt = "0.4.9" ntex-rt = "0.4.9"
@ -70,7 +70,7 @@ base64 = "0.21"
bitflags = "2.4" bitflags = "2.4"
log = "0.4" log = "0.4"
nanorand = { version = "0.7.0", default-features = false, features = ["std", "wyrand"] } nanorand = { version = "0.7.0", default-features = false, features = ["std", "wyrand"] }
polling = "3.2.0" polling = "3.3"
pin-project-lite = "0.2" pin-project-lite = "0.2"
regex = { version = "1.10.1", default-features = false, features = ["std"] } regex = { version = "1.10.1", default-features = false, features = ["std"] }
sha-1 = "0.10" sha-1 = "0.10"