diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2020-02-03 18:08:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 18:08:44 -0500 |
commit | 161cf7cdfd44ace8937fb7940727984990742d18 (patch) | |
tree | 1ef88b3cd6427353366d930ea9be5ae494504255 /cli/ops/dispatch_json.rs | |
parent | 0471243334ac1aeb76dcaadbc3f0b8114d188fb8 (diff) |
refactor: Use Tokio's single-threaded runtime (#3844)
This change simplifies how we execute V8. Previously V8 Isolates jumped
around threads every time they were woken up. This was overly complex and
potentially hurting performance in a myriad ways. Now isolates run on
their own dedicated thread and never move.
- blocking_json spawns a thread and does not use a thread pool
- op_host_poll_worker and op_host_resume_worker are non-operational
- removes Worker::get_message and Worker::post_message
- ThreadSafeState::workers table contains WorkerChannel entries instead
of actual Worker instances.
- MainWorker and CompilerWorker are no longer Futures.
- The multi-threaded version of deno_core_http_bench was removed.
- AyncOps no longer need to be Send + Sync
This PR is very large and several tests were disabled to speed
integration:
- installer_test_local_module_run
- installer_test_remote_module_run
- _015_duplicate_parallel_import
- _026_workers
Diffstat (limited to 'cli/ops/dispatch_json.rs')
-rw-r--r-- | cli/ops/dispatch_json.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs index 0b053b1e8..0806001ab 100644 --- a/cli/ops/dispatch_json.rs +++ b/cli/ops/dispatch_json.rs @@ -6,10 +6,10 @@ use serde_json::json; pub use serde_json::Value; use std::future::Future; use std::pin::Pin; -use tokio::task; -pub type AsyncJsonOp = - Pin<Box<dyn Future<Output = Result<Value, ErrBox>> + Send>>; +pub type JsonResult = Result<Value, ErrBox>; + +pub type AsyncJsonOp = Pin<Box<dyn Future<Output = JsonResult>>>; pub enum JsonOp { Sync(Value), @@ -27,10 +27,7 @@ fn json_err(err: ErrBox) -> Value { }) } -fn serialize_result( - promise_id: Option<u64>, - result: Result<Value, ErrBox>, -) -> Buf { +fn serialize_result(promise_id: Option<u64>, result: JsonResult) -> Buf { let value = match result { Ok(v) => json!({ "ok": v, "promiseId": promise_id }), Err(err) => json!({ "err": json_err(err), "promiseId": promise_id }), @@ -78,21 +75,21 @@ where let fut2 = fut.then(move |result| { futures::future::ok(serialize_result(promise_id, result)) }); - CoreOp::Async(fut2.boxed()) + CoreOp::Async(fut2.boxed_local()) } Ok(JsonOp::AsyncUnref(fut)) => { assert!(promise_id.is_some()); let fut2 = fut.then(move |result| { futures::future::ok(serialize_result(promise_id, result)) }); - CoreOp::AsyncUnref(fut2.boxed()) + CoreOp::AsyncUnref(fut2.boxed_local()) } Err(sync_err) => { let buf = serialize_result(promise_id, Err(sync_err)); if is_sync { CoreOp::Sync(buf) } else { - CoreOp::Async(futures::future::ok(buf).boxed()) + CoreOp::Async(futures::future::ok(buf).boxed_local()) } } } @@ -101,17 +98,20 @@ where pub fn blocking_json<F>(is_sync: bool, f: F) -> Result<JsonOp, ErrBox> where - F: 'static + Send + FnOnce() -> Result<Value, ErrBox> + Unpin, + F: 'static + Send + FnOnce() -> JsonResult, { if is_sync { Ok(JsonOp::Sync(f()?)) } else { - let fut = async move { - task::spawn_blocking(move || f()) - .await - .map_err(ErrBox::from)? - } - .boxed(); - Ok(JsonOp::Async(fut.boxed())) + // TODO(ry) use thread pool. + let fut = crate::tokio_util::spawn_thread(f); + /* + let fut = async move { + tokio::task::spawn_blocking(move || f()) + .await + .map_err(ErrBox::from)? + }.boxed_local(); + */ + Ok(JsonOp::Async(fut.boxed_local())) } } |