eater
/
async-std
forked from mirror/async-std
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

begin implementing BufWriter

Browse Source
staging
Kirill Mironov 5 years ago
parent 91aeb39e4c
commit 48d4c9b18d
2 changed files with 264 additions and 48 deletions
Show Stats Download Patch File Download Diff File

310
src/io/buf_writer.rs
Unescape Escape View File

@ -7,35 +7,138 @@ use crate::io::Write;
const DEFAULT_CAPACITY: usize = 8 * 1024;
pub struct BufWriter<W: AsyncWrite> {
inner: Option<W>,
/// Wraps a writer and buffers its output.
///
/// It can be excessively inefficient to work directly with something that
/// implements [`Write`]. For example, every call to
/// [`write`][`TcpStream::write`] on [`TcpStream`] results in a system call. A
/// `BufWriter` keeps an in-memory buffer of data and writes it to an underlying
/// writer in large, infrequent batches.
///
/// `BufWriter` can improve the speed of programs that make *small* and
/// *repeated* write calls to the same file or network socket. It does not
/// help when writing very large amounts at once, or writing just one or a few
/// times. It also provides no advantage when writing to a destination that is
/// in memory, like a `Vec<u8>`.
///
/// When the `BufWriter` is dropped, the contents of its buffer will be written
/// out. However, any errors that happen in the process of flushing the buffer
/// when the writer is dropped will be ignored. Code that wishes to handle such
/// errors must manually call [`flush`] before the writer is dropped.
///
/// This type is an async version of [`std::io::BufReader`].
///
/// [`std::io::BufReader`]: https://doc.rust-lang.org/std/io/struct.BufReader.html
///
/// # Examples
///
/// Let's write the numbers one through ten to a [`TcpStream`]:
///
/*/ ```no_run
/ use std::io::prelude::*;
/ use std::net::TcpStream;
/
/ let mut stream = TcpStream::connect("127.0.0.1:34254").unwrap();
/
/ for i in 0..10 {
/ stream.write(&[i+1]).unwrap();
/ }
/ ```*/
///
/// Because we're not buffering, we write each one in turn, incurring the
/// overhead of a system call per byte written. We can fix this with a
/// `BufWriter`:
///
/*/ ```no_run
/ use std::io::prelude::*;
/ use std::io::BufWriter;
/ use std::net::TcpStream;
/
/ let mut stream = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
/
/ for i in 0..10 {
/ stream.write(&[i+1]).unwrap();
/ }
/ ```*/
///
/// By wrapping the stream with a `BufWriter`, these ten writes are all grouped
/// together by the buffer, and will all be written out in one system call when
/// the `stream` is dropped.
///
/// [`Write`]: ../../std/io/trait.Write.html
/// [`TcpStream::write`]: ../../std/net/struct.TcpStream.html#method.write
/// [`TcpStream`]: ../../std/net/struct.TcpStream.html
/// [`flush`]: #method.flush
pub struct BufWriter<W> {
inner: W,
buf: Vec<u8>,
panicked: bool,
written: usize,
}
impl<W: AsyncWrite + Unpin> BufWriter<W> {
pin_utils::unsafe_pinned!(inner: Option<W>);
pin_utils::unsafe_unpinned!(panicked: bool);
pin_utils::unsafe_pinned!(inner: W);
pin_utils::unsafe_unpinned!(buf: Vec<u8>);
/// Creates a new `BufWriter` with a default buffer capacity. The default is currently 8 KB,
/// but may change in the future.
///
/// # Examples
///
/// ```no_run
/// use async_std::io::BufWriter;
/// use async_std::net::TcpStream;
///
/// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
/// ```
pub fn new(inner: W) -> BufWriter<W> {
BufWriter::with_capacity(DEFAULT_CAPACITY, inner)
}
/// Creates a new `BufWriter` with the specified buffer capacity.
///
/// # Examples
///
/// Creating a buffer with a buffer of a hundred bytes.
///
/// ```no_run
/// use async_std::io::BufWriter;
/// use async_std::net::TcpStream;
///
/// let stream = TcpStream::connect("127.0.0.1:34254").unwrap();
/// let mut buffer = BufWriter::with_capacity(100, stream);
/// ```
pub fn with_capacity(capacity: usize, inner: W) -> BufWriter<W> {
BufWriter {
inner: Some(inner),
inner,
buf: Vec::with_capacity(capacity),
panicked: false,
written: 0,
}
}
pub fn get_ref(&self) -> &W {
self.inner.as_ref().unwrap()
&self.inner
}
pub fn get_mut(&mut self) -> &mut W {
self.inner.as_mut().unwrap()
&mut self.inner
}
pub fn get_pin_mut(self: Pin<&mut Self>) -> Pin<&mut W> {
self.inner()
}
/// Consumes BufWriter, returning the underlying writer
///
/// This method will not write leftover data, it will be lost.
/// For method that will attempt to write before returning the writer see [`poll_into_inner`]
///
/// [`poll_into_inner`]: #method.poll_into_inner
pub fn into_inner(self) -> W {
self.inner
}
pub fn poll_into_inner(mut self: Pin<&mut Self>, cx: Context<'_>) -> Poll<io::Result<usize>> {
unimplemented!("poll into inner method")
}
pub fn buffer(&self) -> &[u8] {
@ -46,17 +149,13 @@ impl<W: AsyncWrite + Unpin> BufWriter<W> {
let Self {
inner,
buf,
panicked
written
} = Pin::get_mut(self);
let mut panicked = Pin::new(panicked);
let mut written = 0;
let mut inner = Pin::new(inner);
let len = buf.len();
let mut ret = Ok(());
while written < len {
*panicked = true;
let r = Pin::new(inner.as_mut().unwrap());
*panicked = false;
match r.poll_write(cx, &buf[written..]) {
while *written < len {
match inner.as_mut().poll_write(cx, &buf[*written..]) {
Poll::Ready(Ok(0)) => {
ret = Err(io::Error::new(
io::ErrorKind::WriteZero,
@ -64,7 +163,7 @@ impl<W: AsyncWrite + Unpin> BufWriter<W> {
));
break;
}
Poll::Ready(Ok(n)) => written += n,
Poll::Ready(Ok(n)) => *written += n,
Poll::Ready(Err(ref e)) if e.kind() == io::ErrorKind::Interrupted => {}
Poll::Ready(Err(e)) => {
ret = Err(e);
@ -73,22 +172,12 @@ impl<W: AsyncWrite + Unpin> BufWriter<W> {
Poll::Pending => return Poll::Pending,
}
}
if written > 0 {
buf.drain(..written);
if *written > 0 {
buf.drain(..*written);
}
*written = 0;
Poll::Ready(ret)
}
pub fn poll_into_inner(
mut self: Pin<&mut Self>,
cx: &mut Context<'_>,
//TODO: Fix 'expected function, found struct `IntoInnerError`' compiler error
) -> Poll<io::Result<W>> {
match ready!(self.as_mut().poll_flush_buf(cx)) {
Ok(()) => Poll::Ready(Ok(self.inner().take().unwrap())),
Err(e) => Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, "")))
}
}
}
impl<W: AsyncWrite + Unpin> AsyncWrite for BufWriter<W> {
@ -97,33 +186,28 @@ impl<W: AsyncWrite + Unpin> AsyncWrite for BufWriter<W> {
cx: &mut Context,
buf: &[u8],
) -> Poll<io::Result<usize>> {
let panicked = self.as_mut().panicked();
if self.as_ref().buf.len() + buf.len() > self.as_ref().buf.capacity() {
match ready!(self.as_mut().poll_flush_buf(cx)) {
Ok(()) => {},
Err(e) => return Poll::Ready(Err(e))
}
if self.buf.len() + buf.len() > self.buf.capacity() {
ready!(self.as_mut().poll_flush_buf(cx))?;
}
if buf.len() >= self.as_ref().buf.capacity() {
*panicked = true;
let r = ready!(self.as_mut().poll_write(cx, buf));
*panicked = false;
return Poll::Ready(r)
if buf.len() >= self.buf.capacity() {
self.inner().poll_write(cx, buf)
} else {
return Poll::Ready(ready!(self.as_ref().buf.write(buf).poll()))
self.buf().write(buf).poll()
}
}
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
unimplemented!()
ready!(self.as_mut().poll_flush_buf(cx))?;
self.inner().poll_flush(cx)
}
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
unimplemented!()
ready!(self.as_mut().poll_flush_buf(cx))?;
self.inner().poll_close(cx)
}
}
impl<W: AsyncWrite + fmt::Debug> fmt::Debug for BufWriter<W> {
impl<W: AsyncWrite + fmt::Debug + Unpin> fmt::Debug for BufWriter<W> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("BufReader")
.field("writer", &self.inner)
@ -135,6 +219,138 @@ impl<W: AsyncWrite + fmt::Debug> fmt::Debug for BufWriter<W> {
}
}
pub struct LineWriter<W: AsyncWrite + Unpin> {
inner: BufWriter<W>,
need_flush: bool,
}
impl<W: AsyncWrite + Unpin> LineWriter<W> {
pin_utils::unsafe_pinned!(inner: BufWriter<W>);
pin_utils::unsafe_unpinned!(need_flush: bool);
/// Creates a new `LineWriter`.
///
/// # Examples
///
/// ```no_run
/// use async_std::fs::File;
/// use async_std::io::LineWriter;
///
/// fn main() -> std::io::Result<()> {
/// async_std::task::block_on(async {
/// let file = File::create("poem.txt").await?;
/// let file = LineWriter::new(file);
/// Ok(())
/// })
/// }
/// ```
pub fn new(inner: W) -> LineWriter<W> {
// Lines typically aren't that long, don't use a giant buffer
LineWriter::with_capacity(1024, inner)
}
/// Creates a new `LineWriter` with a specified capacity for the internal
/// buffer.
///
/// # Examples
///
/// ```no_run
/// use async_std::fs::File;
/// use async_std::io::LineWriter;
///
/// fn main() -> std::io::Result<()> {
/// async_std::task::block_on(async {
/// let file = File::create("poem.txt").await?;
/// let file = LineWriter::with_capacity(100, file);
/// Ok(())
/// })
/// }
/// ```
pub fn with_capacity(capacity: usize, inner: W) -> LineWriter<W> {
LineWriter {
inner: BufWriter::with_capacity(capacity, inner),
need_flush: false,
}
}
pub fn get_ref(&self) -> &W {
self.inner.get_ref()
}
pub fn get_mut(&mut self) -> &mut W {
self.inner.get_mut()
}
pub fn into_inner(self) -> W {
self.inner.into_inner()
}
}
impl<W: AsyncWrite + Unpin> AsyncWrite for LineWriter<W> {
fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
if self.need_flush {
self.as_mut().poll_flush(cx)?;
}
let i = match memchr::memrchr(b'\n', buf) {
Some(i) => i,
None => return self.as_mut().inner().as_mut().poll_write(cx, buf)
};
let n = ready!(self.as_mut().inner().as_mut().poll_write(cx, &buf[..=i])?);
*self.as_mut().need_flush() = true;
if ready!(self.as_mut().poll_flush(cx)).is_err() || n != 1 + 1 {
return Poll::Ready(Ok(n))
}
match ready!(self.inner().poll_write(cx, &buf[i + 1..])) {
Ok(i) => Poll::Ready(Ok(n + 1)),
Err(_) => Poll::Ready(Ok(n))
}
}
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
self.as_mut().inner().poll_flush(cx)?;
*self.need_flush() = false;
Poll::Ready(Ok(()))
}
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
self.as_mut().inner().poll_flush(cx)?;
self.inner().poll_close(cx)
}
}
impl<W: AsyncWrite + Unpin> fmt::Debug for LineWriter<W> where W: fmt::Debug {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt.debug_struct("LineWriter")
.field("writer", &self.inner.inner)
.field("buffer",
&format_args!("{}/{}", self.inner.buf.len(), self.inner.buf.capacity()))
.finish()
}
}
mod tests {
use crate::prelude::*;
use crate::task;
use super::LineWriter;
#[test]
fn test_line_buffer() {
task::block_on(async {
let mut writer = LineWriter::new(Vec::new());
writer.write(&[0]).await.unwrap();
assert_eq!(*writer.get_ref(), []);
writer.write(&[1]).await.unwrap();
assert_eq!(*writer.get_ref(), []);
writer.flush().await.unwrap();
assert_eq!(*writer.get_ref(), [0, 1]);
writer.write(&[0, b'\n', 1, b'\n', 2]).await.unwrap();
assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n']);
writer.flush().await.unwrap();
assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n', 2]);
writer.write(&[3, b'\n']).await.unwrap();
assert_eq!(*writer.get_ref(), [0, 1, 0, b'\n', 1, b'\n', 2, 3, b'\n']);
})
}
}

2
src/io/mod.rs
Unescape Escape View File

@ -28,7 +28,7 @@ pub use std::io::{Error, ErrorKind, Result, SeekFrom};
pub use buf_read::{BufRead, Lines};
pub use buf_reader::BufReader;
pub use buf_writer::BufWriter;
pub use buf_writer::{BufWriter, LineWriter};
pub use copy::copy;
pub use empty::{empty, Empty};
pub use read::Read;

Write Preview
Loading…
Cancel
Save