mirror of
https://github.com/denoland/deno.git
synced 2024-11-29 16:30:56 -05:00
Optimization: eager write
This commit is contained in:
parent
2c33334d28
commit
aac9e204b7
2 changed files with 51 additions and 2 deletions
|
@ -11,7 +11,6 @@ use msg;
|
|||
use resources;
|
||||
use resources::Resource;
|
||||
use tokio_util;
|
||||
use tokio_write;
|
||||
use version;
|
||||
|
||||
use flatbuffers::FlatBufferBuilder;
|
||||
|
@ -703,7 +702,7 @@ fn op_write(
|
|||
match resources::lookup(rid) {
|
||||
None => odd_future(errors::bad_resource()),
|
||||
Some(resource) => {
|
||||
let op = tokio_write::write(resource, data)
|
||||
let op = resources::eager_write(resource, data)
|
||||
.map_err(|err| DenoError::from(err))
|
||||
.and_then(move |(_resource, _buf, nwritten)| {
|
||||
let builder = &mut FlatBufferBuilder::new();
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
// handlers) look up resources by their integer id here.
|
||||
|
||||
use errors::DenoError;
|
||||
use tokio_write;
|
||||
|
||||
use futures;
|
||||
use futures::future::Either;
|
||||
|
@ -241,3 +242,52 @@ where
|
|||
},
|
||||
}
|
||||
}
|
||||
|
||||
type EagerWrite<R, T> =
|
||||
Either<tokio_write::Write<R, T>, FutureResult<(R, T, usize), std::io::Error>>;
|
||||
|
||||
#[cfg(windows)]
|
||||
pub fn eager_write<T>(resource: Resource, buf: T) -> EagerWrite<Resource, T>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
Either::A(tokio_write::write(resource, buf)).into()
|
||||
}
|
||||
|
||||
// This is an optimization that Tokio should do.
|
||||
// Attempt to call write() on the main thread.
|
||||
#[cfg(not(windows))]
|
||||
pub fn eager_write<T>(resource: Resource, buf: T) -> EagerWrite<Resource, T>
|
||||
where
|
||||
T: AsRef<[u8]>,
|
||||
{
|
||||
let mut table = RESOURCE_TABLE.lock().unwrap();
|
||||
let maybe_repr = table.get_mut(&resource.rid);
|
||||
match maybe_repr {
|
||||
None => panic!("bad rid"),
|
||||
Some(repr) => match repr {
|
||||
Repr::TcpStream(ref mut tcp_stream) => {
|
||||
// Unforunately we can't just call write() on tokio::net::TcpStream
|
||||
use std::os::unix::io::AsRawFd;
|
||||
use std::os::unix::io::FromRawFd;
|
||||
use std::os::unix::io::IntoRawFd;
|
||||
let mut std_tcp_stream =
|
||||
unsafe { std::net::TcpStream::from_raw_fd(tcp_stream.as_raw_fd()) };
|
||||
let write_result = std_tcp_stream.write(buf.as_ref());
|
||||
// std_tcp_stream will close when it gets dropped. Thus...
|
||||
let _ = std_tcp_stream.into_raw_fd();
|
||||
match write_result {
|
||||
Ok(nwrite) => Either::B(futures::future::ok((resource, buf, nwrite))),
|
||||
Err(err) => {
|
||||
if err.kind() == std::io::ErrorKind::WouldBlock {
|
||||
Either::A(tokio_write::write(resource, buf))
|
||||
} else {
|
||||
Either::B(futures::future::err(err))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => Either::A(tokio_write::write(resource, buf)),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue