tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tokio 1.0: AsyncRead/Seek with ReadBuf

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2020-12-04 09:34:08 +01:00
parent d148958b67
commit 484172b5f8
3 changed files with 19 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/tools/async_io.rs
View File

@ -1,13 +1,12 @@
//! Generic AsyncRead/AsyncWrite utilities.
use std::io;
use std::mem::MaybeUninit;
use std::os::unix::io::{AsRawFd, RawFd};
use std::pin::Pin;
use std::task::{Context, Poll};
use futures::stream::{Stream, TryStream};
use tokio::io::{AsyncRead, AsyncWrite};
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
use tokio::net::TcpListener;
use hyper::client::connect::Connection;
@ -20,8 +19,8 @@ impl<L: AsyncRead + Unpin, R: AsyncRead + Unpin> AsyncRead for EitherStream<L, R
fn poll_read(
self: Pin<&mut Self>,
cx: &mut Context,
buf: &mut [u8],
) -> Poll<Result<usize, io::Error>> {
buf: &mut ReadBuf,
) -> Poll<Result<(), io::Error>> {
match self.get_mut() {
EitherStream::Left(ref mut s) => {
Pin::new(s).poll_read(cx, buf)
@ -31,31 +30,6 @@ impl<L: AsyncRead + Unpin, R: AsyncRead + Unpin> AsyncRead for EitherStream<L, R
}
}
}
unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [MaybeUninit<u8>]) -> bool {
match *self {
EitherStream::Left(ref s) => s.prepare_uninitialized_buffer(buf),
EitherStream::Right(ref s) => s.prepare_uninitialized_buffer(buf),
}
}
fn poll_read_buf<B>(
self: Pin<&mut Self>,
cx: &mut Context,
buf: &mut B,
) -> Poll<Result<usize, io::Error>>
where
B: bytes::BufMut,
{
match self.get_mut() {
EitherStream::Left(ref mut s) => {
Pin::new(s).poll_read_buf(cx, buf)
}
EitherStream::Right(ref mut s) => {
Pin::new(s).poll_read_buf(cx, buf)
}
}
}
}
impl<L: AsyncWrite + Unpin, R: AsyncWrite + Unpin> AsyncWrite for EitherStream<L, R> {
@ -95,24 +69,6 @@ impl<L: AsyncWrite + Unpin, R: AsyncWrite + Unpin> AsyncWrite for EitherStream<L
}
}
}
fn poll_write_buf<B>(
self: Pin<&mut Self>,
cx: &mut Context,
buf: &mut B,
) -> Poll<Result<usize, io::Error>>
where
B: bytes::Buf,
{
match self.get_mut() {
EitherStream::Left(ref mut s) => {
Pin::new(s).poll_write_buf(cx, buf)
}
EitherStream::Right(ref mut s) => {
Pin::new(s).poll_write_buf(cx, buf)
}
}
}
}
// we need this for crate::client::http_client:

8
src/tools/wrapped_reader_stream.rs
View File

@ -3,7 +3,7 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use std::sync::mpsc::Receiver;
use tokio::io::AsyncRead;
use tokio::io::{AsyncRead, ReadBuf};
use futures::ready;
use futures::stream::Stream;
@ -69,8 +69,10 @@ impl<R: AsyncRead + Unpin> Stream for AsyncReaderStream<R> {
fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
let this = self.get_mut();
match ready!(Pin::new(&mut this.reader).poll_read(cx, &mut this.buffer)) {
Ok(n) => {
let mut read_buf = ReadBuf::new(&mut this.buffer);
match ready!(Pin::new(&mut this.reader).poll_read(cx, &mut read_buf)) {
Ok(()) => {
let n = read_buf.filled().len();
if n == 0 {
// EOF
Poll::Ready(None)