1
0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-28 01:32:57 +01:00

flush is useless

This commit is contained in:
Nikolay Kim 2018-01-14 19:28:34 -08:00
parent 89a89e7b18
commit a7c24aace1
6 changed files with 14 additions and 39 deletions

View File

@ -575,16 +575,6 @@ impl<S: 'static, H> ProcessResponse<S, H> {
if self.running == RunningState::Paused || self.drain.is_some() { if self.running == RunningState::Paused || self.drain.is_some() {
match io.poll_completed(false) { match io.poll_completed(false) {
Ok(Async::Ready(_)) => { Ok(Async::Ready(_)) => {
match io.flush() {
Ok(Async::Ready(_)) => (),
Ok(Async::NotReady) => return Err(PipelineState::Response(self)),
Err(err) => {
debug!("Error sending data: {}", err);
info.error = Some(err.into());
return Ok(FinishingMiddlewares::init(info, self.resp))
}
}
self.running.resume(); self.running.resume();
// resolve drain futures // resolve drain futures

View File

@ -535,14 +535,10 @@ impl ContentEncoder {
#[inline] #[inline]
pub fn is_eof(&self) -> bool { pub fn is_eof(&self) -> bool {
match *self { match *self {
ContentEncoder::Br(ref encoder) => ContentEncoder::Br(ref encoder) => encoder.get_ref().is_eof(),
encoder.get_ref().is_eof(), ContentEncoder::Deflate(ref encoder) => encoder.get_ref().is_eof(),
ContentEncoder::Deflate(ref encoder) => ContentEncoder::Gzip(ref encoder) => encoder.get_ref().is_eof(),
encoder.get_ref().is_eof(), ContentEncoder::Identity(ref encoder) => encoder.is_eof(),
ContentEncoder::Gzip(ref encoder) =>
encoder.get_ref().is_eof(),
ContentEncoder::Identity(ref encoder) =>
encoder.is_eof(),
} }
} }
@ -710,6 +706,7 @@ impl TransferEncoding {
let mut buf = BytesMut::new(); let mut buf = BytesMut::new();
write!(&mut buf, "{:X}\r\n", msg.len()) write!(&mut buf, "{:X}\r\n", msg.len())
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
self.buffer.reserve(buf.len() + msg.len() + 2);
self.buffer.extend(buf.into()); self.buffer.extend(buf.into());
self.buffer.extend(msg); self.buffer.extend(msg);
self.buffer.extend_from_slice(b"\r\n"); self.buffer.extend_from_slice(b"\r\n");

View File

@ -66,6 +66,10 @@ impl<T: AsyncWrite> H1Writer<T> {
fn write_to_stream(&mut self) -> io::Result<WriterState> { fn write_to_stream(&mut self) -> io::Result<WriterState> {
while !self.buffer.is_empty() { while !self.buffer.is_empty() {
match self.stream.write(self.buffer.as_ref()) { match self.stream.write(self.buffer.as_ref()) {
Ok(0) => {
self.disconnected();
return Ok(WriterState::Done);
},
Ok(n) => { Ok(n) => {
let _ = self.buffer.split_to(n); let _ = self.buffer.split_to(n);
}, },
@ -90,20 +94,6 @@ impl<T: AsyncWrite> Writer for H1Writer<T> {
self.written self.written
} }
#[inline]
fn flush(&mut self) -> Poll<(), io::Error> {
match self.stream.flush() {
Ok(_) => Ok(Async::Ready(())),
Err(e) => {
if e.kind() == io::ErrorKind::WouldBlock {
Ok(Async::NotReady)
} else {
Err(e)
}
}
}
}
fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse) -> io::Result<WriterState> { fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse) -> io::Result<WriterState> {
// prepare task // prepare task
self.flags.insert(Flags::STARTED); self.flags.insert(Flags::STARTED);

View File

@ -108,11 +108,6 @@ impl Writer for H2Writer {
self.written self.written
} }
#[inline]
fn flush(&mut self) -> Poll<(), io::Error> {
Ok(Async::Ready(()))
}
fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse) -> io::Result<WriterState> { fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse) -> io::Result<WriterState> {
// prepare response // prepare response
self.flags.insert(Flags::STARTED); self.flags.insert(Flags::STARTED);

View File

@ -104,8 +104,6 @@ pub trait Writer {
fn write_eof(&mut self) -> io::Result<WriterState>; fn write_eof(&mut self) -> io::Result<WriterState>;
fn flush(&mut self) -> Poll<(), io::Error>;
fn poll_completed(&mut self, shutdown: bool) -> Poll<(), io::Error>; fn poll_completed(&mut self, shutdown: bool) -> Poll<(), io::Error>;
} }

View File

@ -90,6 +90,11 @@ impl SharedBytes {
self.get_mut().take() self.get_mut().take()
} }
#[inline]
pub fn reserve(&self, cnt: usize) {
self.get_mut().reserve(cnt)
}
#[inline] #[inline]
#[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))] #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
pub fn extend(&self, data: Binary) { pub fn extend(&self, data: Binary) {