forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(http): Buffered::read_from_io now returns Poll

Browse Source
This commit is contained in:
Yazad Daruvala
2017-06-19 01:45:57 -07:00
parent a0c3a33eda
commit 5ed9e31b82
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/io.rs
View File

@@ -69,7 +69,7 @@ impl<T: AsyncRead + AsyncWrite> Buffered<T> {
} }
}, },
} }
match try_nb!(self.read_from_io()) { match try_ready!(self.read_from_io()) {
0 => { 0 => {
trace!("parse eof"); trace!("parse eof");
//TODO: With Rust 1.14, this can be Error::from(ErrorKind) //TODO: With Rust 1.14, this can be Error::from(ErrorKind)
@@ -80,7 +80,7 @@ impl<T: AsyncRead + AsyncWrite> Buffered<T> {
} }
} }
fn read_from_io(&mut self) -> io::Result<usize> { fn read_from_io(&mut self) -> Poll<usize, io::Error> {
use bytes::BufMut; use bytes::BufMut;
// TODO: Investigate if we still need these unsafe blocks // TODO: Investigate if we still need these unsafe blocks
if self.read_buf.remaining_mut() < INIT_BUFFER_SIZE { if self.read_buf.remaining_mut() < INIT_BUFFER_SIZE {
@@ -97,13 +97,15 @@ impl<T: AsyncRead + AsyncWrite> Buffered<T> {
Ok(n) => n, Ok(n) => n,
Err(e) => { Err(e) => {
if e.kind() == io::ErrorKind::WouldBlock { if e.kind() == io::ErrorKind::WouldBlock {
// TODO: Push this out, ideally, into http::Conn.
self.read_blocked = true; self.read_blocked = true;
return Ok(Async::NotReady);
} }
return Err(e) return Err(e)
} }
}; };
self.read_buf.advance_mut(n); self.read_buf.advance_mut(n);
Ok(n) Ok(Async::Ready(n))
} }
} }
@@ -153,7 +155,7 @@ impl<T: AsyncRead + AsyncWrite> MemRead for Buffered<T> {
trace!("Buffered.read_mem read_buf is not empty, slicing {}", n); trace!("Buffered.read_mem read_buf is not empty, slicing {}", n);
Ok(Async::Ready(self.read_buf.split_to(n).freeze())) Ok(Async::Ready(self.read_buf.split_to(n).freeze()))
} else { } else {
let n = try_nb!(self.read_from_io()); let n = try_ready!(self.read_from_io());
Ok(Async::Ready(self.read_buf.split_to(::std::cmp::min(len, n)).freeze())) Ok(Async::Ready(self.read_buf.split_to(::std::cmp::min(len, n)).freeze()))
} }
} }