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

Release write buf after error

Browse source
This commit is contained in:
Nikolay Kim 2021-12-26 19:24:13 +06:00
parent c801a9ea57
commit 19c6a2b731
15 changed files with 78 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-io/src/framed.rs
View file

@ -85,7 +85,7 @@ where
&self,
item: <U as Encoder>::Item,
) -> Result<(), Either<U::Error, io::Error>> {
self.io.send(&self.codec, item).await
self.io.send(item, &self.codec).await
}
}

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

@ -459,22 +459,18 @@ impl<F> Io<F> {
/// Encode item, send to a peer
pub async fn send<U>(
&self,
codec: &U,
item: U::Item,
codec: &U,
) -> Result<(), Either<U::Error, io::Error>>
where
U: Encoder,
{
let filter = self.filter();
let mut buf = filter
.get_write_buf()
.unwrap_or_else(|| self.memory_pool().get_write_buf());
codec.encode(item, &mut buf).map_err(Either::Left)?;
filter.release_write_buf(buf).map_err(Either::Right)?;
self.encode(item, codec).map_err(Either::Left)?;
poll_fn(|cx| self.poll_flush(cx, true))
.await
.map_err(Either::Right)?;
Ok(())
}

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

@ -145,8 +145,12 @@ impl IoRef {
let mut buf = filter
.get_write_buf()
.unwrap_or_else(|| self.memory_pool().get_write_buf());
let is_write_sleep = buf.is_empty();
let result = f(&mut buf);
if is_write_sleep {
self.0.write_task.wake();
}
filter.release_write_buf(buf)?;
Ok(result)
}
@ -177,29 +181,28 @@ impl IoRef {
let flags = self.0.flags.get();
if !flags.intersects(Flags::IO_ERR | Flags::IO_SHUTDOWN) {
let filter = self.0.filter.get();
let mut buf = filter
.get_write_buf()
.unwrap_or_else(|| self.memory_pool().get_write_buf());
let is_write_sleep = buf.is_empty();
let (hw, lw) = self.memory_pool().write_params().unpack();
self.with_write_buf(|buf| {
let (hw, lw) = self.memory_pool().write_params().unpack();
// make sure we've got room
let remaining = buf.remaining_mut();
if remaining < lw {
buf.reserve(hw - remaining);
}
// make sure we've got room
let remaining = buf.remaining_mut();
if remaining < lw {
buf.reserve(hw - remaining);
}
// encode item and wake write task
codec.encode(item, &mut buf)?;
if is_write_sleep {
self.0.write_task.wake();
}
if let Err(err) = filter.release_write_buf(buf) {
self.0.set_error(Some(err));
}
// encode item and wake write task
codec.encode(item, buf)
})
.map_or_else(
|err| {
self.0.set_error(Some(err));
Ok(())
},
|item| item,
)
} else {
Ok(())
}
Ok(())
}
#[inline]
@ -221,31 +224,15 @@ impl IoRef {
#[inline]
/// Write bytes to a buffer and wake up write task
///
/// Returns write buffer state, false is returned if write buffer if full.
pub fn write(&self, src: &[u8]) -> Result<bool, io::Error> {
pub fn write(&self, src: &[u8]) -> io::Result<()> {
let flags = self.0.flags.get();
if !flags.intersects(Flags::IO_ERR | Flags::IO_SHUTDOWN) {
let filter = self.0.filter.get();
let mut buf = filter
.get_write_buf()
.unwrap_or_else(|| self.memory_pool().get_write_buf());
let is_write_sleep = buf.is_empty();
// write and wake write task
buf.extend_from_slice(src);
let result = buf.len() < self.memory_pool().write_params_high();
if is_write_sleep {
self.0.write_task.wake();
}
if let Err(err) = filter.release_write_buf(buf) {
self.0.set_error(Some(err));
}
Ok(result)
self.with_write_buf(|buf| {
buf.extend_from_slice(src);
})
} else {
Ok(true)
Ok(())
}
}
}
@ -318,14 +305,14 @@ mod tests {
client.remote_buffer_cap(1024);
let state = Io::new(server);
state
.send(&BytesCodec, Bytes::from_static(b"test"))
.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
let buf = client.read().await.unwrap();
assert_eq!(buf, Bytes::from_static(b"test"));
client.write_error(io::Error::new(io::ErrorKind::Other, "err"));
let res = state.send(&BytesCodec, Bytes::from_static(b"test")).await;
let res = state.send(Bytes::from_static(b"test"), &BytesCodec).await;
assert!(res.is_err());
assert!(state.flags().contains(Flags::IO_ERR));
@ -496,7 +483,7 @@ mod tests {
assert_eq!(msg, Bytes::from_static(BIN));
state
.send(&BytesCodec, Bytes::from_static(b"test"))
.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
let buf = client.read().await.unwrap();
@ -541,7 +528,7 @@ mod tests {
assert_eq!(msg, Bytes::from_static(BIN));
state
.send(&BytesCodec, Bytes::from_static(b"test"))
.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
let buf = client.read().await.unwrap();

2
ntex-tls/examples/client.rs
View file

@ -20,7 +20,7 @@ async fn main() -> io::Result<()> {
let io = connector.connect("127.0.0.1:8443").await.unwrap();
println!("Connected to ssl server");
let result = io
.send(&codec::BytesCodec, Bytes::from_static(b"hello"))
.send(Bytes::from_static(b"hello"), &codec::BytesCodec)
.await
.map_err(Either::into_inner)?;

4
ntex-tls/examples/rustls-server.rs
View file

@ -40,8 +40,8 @@ async fn main() -> io::Result<()> {
println!("New client is connected");
io.send(
&codec::BytesCodec,
ntex_bytes::Bytes::from_static(b"Welcome!\n"),
&codec::BytesCodec,
)
.await
.map_err(Either::into_inner)?;
@ -50,7 +50,7 @@ async fn main() -> io::Result<()> {
match io.recv(&codec::BytesCodec).await {
Ok(Some(msg)) => {
println!("Got message: {:?}", msg);
io.send(&codec::BytesCodec, msg.freeze())
io.send(msg.freeze(), &codec::BytesCodec)
.await
.map_err(Either::into_inner)?;
}

2
ntex-tls/examples/server.rs
View file

@ -32,7 +32,7 @@ async fn main() -> io::Result<()> {
match io.recv(&codec::BytesCodec).await {
Ok(Some(msg)) => {
println!("Got message: {:?}", msg);
io.send(&codec::BytesCodec, msg.freeze())
io.send(msg.freeze(), &codec::BytesCodec)
.await
.map_err(Either::into_inner)?;
}

2
ntex/src/http/client/h1proto.rs
View file

@ -59,7 +59,7 @@ where
// send request
let codec = h1::ClientCodec::default();
io.send(&codec, (head, body.size()).into()).await?;
io.send((head, body.size()).into(), &codec).await?;
log::trace!("http1 request has been sent");

2
ntex/src/ws/client.rs
View file

@ -164,8 +164,8 @@ where
// send request and read response
let fut = async {
io.send(
&codec,
(RequestHeadType::Rc(head, Some(headers)), BodySize::None).into(),
&codec,
)
.await?;
io.recv(&codec)

4
ntex/src/ws/transport.rs
View file

@ -287,14 +287,14 @@ mod tests {
.unwrap();
client
.send(&BytesCodec, Bytes::from_static(b"DATA"))
.send(Bytes::from_static(b"DATA"), &BytesCodec)
.await
.unwrap();
let res = server.recv(&BytesCodec).await.unwrap().unwrap();
assert_eq!(res, b"DATA".as_ref());
server
.send(&BytesCodec, Bytes::from_static(b"DATA"))
.send(Bytes::from_static(b"DATA"), &BytesCodec)
.await
.unwrap();
let res = client.recv(&BytesCodec).await.unwrap().unwrap();

12
ntex/tests/connect.rs
View file

@ -12,7 +12,7 @@ use ntex::util::Bytes;
async fn test_string() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())
@ -30,7 +30,7 @@ async fn test_string() {
async fn test_rustls_string() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())
@ -47,7 +47,7 @@ async fn test_rustls_string() {
async fn test_static_str() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())
@ -69,7 +69,7 @@ async fn test_static_str() {
async fn test_new_service() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())
@ -89,7 +89,7 @@ async fn test_uri() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())
@ -111,7 +111,7 @@ async fn test_rustls_uri() {
let srv = test_server(|| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, io::Error>(())

4
ntex/tests/http_openssl.rs
View file

@ -463,7 +463,7 @@ async fn test_ws_transport() {
if let Some(item) =
io.recv(&BytesCodec).await.map_err(|e| e.into_inner())?
{
io.send(&BytesCodec, item.freeze()).await.unwrap()
io.send(item.freeze(), &BytesCodec).await.unwrap()
} else {
break;
}
@ -478,7 +478,7 @@ async fn test_ws_transport() {
let io = srv.wss().await.unwrap().into_inner().0;
let codec = ws::Codec::default().client_mode();
io.send(&codec, ws::Message::Binary(Bytes::from_static(b"text")))
io.send(ws::Message::Binary(Bytes::from_static(b"text")), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();

32
ntex/tests/http_ws.rs
View file

@ -95,7 +95,7 @@ async fn test_simple() {
assert_eq!(conn.response().status(), StatusCode::SWITCHING_PROTOCOLS);
let (io, codec, _) = conn.into_inner();
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
.await
.unwrap();
let item = io.recv(&codec).await;
@ -104,7 +104,7 @@ async fn test_simple() {
ws::Frame::Text(Bytes::from_static(b"text"))
);
io.send(&codec, ws::Message::Binary("text".into()))
io.send(ws::Message::Binary("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await;
@ -113,7 +113,7 @@ async fn test_simple() {
ws::Frame::Binary(Bytes::from_static(&b"text"[..]))
);
io.send(&codec, ws::Message::Ping("text".into()))
io.send(ws::Message::Ping("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await;
@ -123,8 +123,8 @@ async fn test_simple() {
);
io.send(
&codec,
ws::Message::Continuation(ws::Item::FirstText("text".into())),
&codec,
)
.await
.unwrap();
@ -136,22 +136,22 @@ async fn test_simple() {
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::FirstText("text".into())),
&codec,
)
.await
.is_err());
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::FirstBinary("text".into())),
&codec,
)
.await
.is_err());
io.send(
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec,
)
.await
.unwrap();
@ -162,8 +162,8 @@ async fn test_simple() {
);
io.send(
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec,
)
.await
.unwrap();
@ -175,23 +175,23 @@ async fn test_simple() {
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec,
)
.await
.is_err());
assert!(io
.send(
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec,
)
.await
.is_err());
io.send(
&codec,
ws::Message::Continuation(ws::Item::FirstBinary(Bytes::from_static(b"bin"))),
&codec,
)
.await
.unwrap();
@ -202,8 +202,8 @@ async fn test_simple() {
);
io.send(
&codec,
ws::Message::Continuation(ws::Item::Continue("text".into())),
&codec,
)
.await
.unwrap();
@ -214,8 +214,8 @@ async fn test_simple() {
);
io.send(
&codec,
ws::Message::Continuation(ws::Item::Last("text".into())),
&codec,
)
.await
.unwrap();
@ -226,8 +226,8 @@ async fn test_simple() {
);
io.send(
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
)
.await
.unwrap();
@ -265,7 +265,7 @@ async fn test_transport() {
if let Some(item) =
io.recv(&BytesCodec).await.map_err(|e| e.into_inner())?
{
io.send(&BytesCodec, item.freeze()).await.unwrap()
io.send(item.freeze(), &BytesCodec).await.unwrap()
} else {
break;
}
@ -280,7 +280,7 @@ async fn test_transport() {
let io = srv.ws().await.unwrap().into_inner().0;
let codec = ws::Codec::default().client_mode();
io.send(&codec, ws::Message::Binary(Bytes::from_static(b"text")))
io.send(ws::Message::Binary(Bytes::from_static(b"text")), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();

10
ntex/tests/http_ws_client.rs
View file

@ -52,27 +52,27 @@ async fn test_simple() {
// client service
let (io, codec, _) = srv.ws().await.unwrap().into_inner();
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Text(Bytes::from_static(b"text")));
io.send(&codec, ws::Message::Binary("text".into()))
io.send(ws::Message::Binary("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Binary(Bytes::from_static(b"text")));
io.send(&codec, ws::Message::Ping("text".into()))
io.send(ws::Message::Ping("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Pong("text".to_string().into()));
io.send(
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
)
.await
.unwrap();
@ -110,7 +110,7 @@ async fn test_transport() {
// client service
let io = srv.ws().await.unwrap().into_transport().await;
io.send(&BytesCodec, Bytes::from_static(b"text"))
io.send(Bytes::from_static(b"text"), &BytesCodec)
.await
.unwrap();
let item = io.recv(&BytesCodec).await.unwrap().unwrap();

2
ntex/tests/server.rs
View file

@ -77,7 +77,7 @@ fn test_run() {
.disable_signals()
.bind("test", addr, move |_| {
fn_service(|io: Io| async move {
io.send(&BytesCodec, Bytes::from_static(b"test"))
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
.unwrap();
Ok::<_, ()>(())

8
ntex/tests/web_ws.rs
View file

@ -38,27 +38,27 @@ async fn web_ws() {
// client service
let (io, codec, _) = srv.ws().await.unwrap().into_inner();
io.send(&codec, ws::Message::Text(ByteString::from_static("text")))
io.send(ws::Message::Text(ByteString::from_static("text")), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Text(Bytes::from_static(b"text")));
io.send(&codec, ws::Message::Binary("text".into()))
io.send(ws::Message::Binary("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Binary(Bytes::from_static(b"text")));
io.send(&codec, ws::Message::Ping("text".into()))
io.send(ws::Message::Ping("text".into()), &codec)
.await
.unwrap();
let item = io.recv(&codec).await.unwrap().unwrap();
assert_eq!(item, ws::Frame::Pong("text".to_string().into()));
io.send(
&codec,
ws::Message::Close(Some(ws::CloseCode::Normal.into())),
&codec,
)
.await
.unwrap();