From 2af25b1957d6415bf4ed89e1e01d379346d93ba8 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 19 Oct 2018 16:10:25 -0400 Subject: Allow partial writes. Do not use tokio_io::io:write_all(). Adds src/tokio_write.rs --- src/ops.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ops.rs') diff --git a/src/ops.rs b/src/ops.rs index 0120f50f0..2d7072dd0 100644 --- a/src/ops.rs +++ b/src/ops.rs @@ -11,6 +11,7 @@ use msg; use resources; use resources::Resource; use tokio_util; +use tokio_write; use version; use flatbuffers::FlatBufferBuilder; @@ -35,7 +36,6 @@ use std::time::{Duration, Instant}; use tokio; use tokio::net::TcpListener; use tokio::net::TcpStream; -use tokio_io; use tokio_threadpool; type OpResult = DenoResult; @@ -703,15 +703,14 @@ fn op_write( match resources::lookup(rid) { None => odd_future(errors::bad_resource()), Some(resource) => { - let len = data.len(); - let op = tokio_io::io::write_all(resource, data) + let op = tokio_write::write(resource, data) .map_err(|err| DenoError::from(err)) - .and_then(move |(_resource, _buf)| { + .and_then(move |(_resource, _buf, nwritten)| { let builder = &mut FlatBufferBuilder::new(); let inner = msg::WriteRes::create( builder, &msg::WriteResArgs { - nbyte: len as u32, + nbyte: nwritten as u32, ..Default::default() }, ); -- cgit v1.2.3