summaryrefslogtreecommitdiff
path: root/cli/workers.rs
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-04-08 10:12:43 -0400
committerGitHub <noreply@github.com>2019-04-08 10:12:43 -0400
commitf7fdb90fd51e340ea598c055bb3573d3cdfbdaa8 (patch)
tree40db117b3a9fd2ac70e3b5551195e21eef464138 /cli/workers.rs
parentcdb72afd8d91978573f0fa897844aee853983b44 (diff)
core: snapshot improvements (#2052)
* Moves how snapshots are supplied to the Isolate. Previously they were given by Behavior::startup_data() but it was only called once at startup. It makes more sense (and simplifies Behavior) to pass it to the constructor of Isolate. * Adds new libdeno type deno_snapshot instead of overloading deno_buf. * Adds new libdeno method to delete snapshot deno_snapshot_delete(). * Renames deno_get_snapshot() to deno_snapshot_new(). * Makes StartupData hold references to snapshots. This was implicit when it previously held a deno_buf but is made explicit now. Note that include_bytes!() returns a &'static [u8] and we want to avoid copying that.
Diffstat (limited to 'cli/workers.rs')
-rw-r--r--cli/workers.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/cli/workers.rs b/cli/workers.rs
index 02126f1e2..7c39a5d2e 100644
--- a/cli/workers.rs
+++ b/cli/workers.rs
@@ -7,7 +7,6 @@ use crate::isolate_state::IsolateStateContainer;
use crate::isolate_state::WorkerChannels;
use crate::ops;
use crate::resources;
-use crate::startup_data;
use deno::deno_buf;
use deno::Behavior;
use deno::Buf;
@@ -44,10 +43,6 @@ impl IsolateStateContainer for &UserWorkerBehavior {
}
impl Behavior for UserWorkerBehavior {
- fn startup_data(&mut self) -> Option<StartupData> {
- Some(startup_data::deno_isolate_init())
- }
-
fn dispatch(
&mut self,
control: &[u8],
@@ -83,7 +78,7 @@ pub struct Worker<B: WorkerBehavior> {
}
impl<B: WorkerBehavior> Worker<B> {
- pub fn new(mut behavior: B) -> Self {
+ pub fn new(startup_data: StartupData, mut behavior: B) -> Self {
let (worker_in_tx, worker_in_rx) = mpsc::channel::<Buf>(1);
let (worker_out_tx, worker_out_rx) = mpsc::channel::<Buf>(1);
@@ -92,7 +87,7 @@ impl<B: WorkerBehavior> Worker<B> {
behavior.set_internal_channels(internal_channels);
- let isolate = Isolate::new(behavior);
+ let isolate = Isolate::new(startup_data, behavior);
Worker {
isolate,
@@ -129,12 +124,13 @@ pub enum WorkerInit {
}
pub fn spawn<B: WorkerBehavior + 'static>(
+ startup_data: StartupData,
behavior: B,
worker_debug_name: &str,
init: WorkerInit,
) -> Result<Worker<B>, RustOrJsError> {
let state = behavior.state().clone();
- let mut worker = Worker::new(behavior);
+ let mut worker = Worker::new(startup_data, behavior);
worker
.execute(&format!("denoMain('{}')", worker_debug_name))
@@ -172,6 +168,7 @@ mod tests {
use crate::compiler::CompilerBehavior;
use crate::isolate_state::IsolateState;
use crate::js_errors::JSErrorColor;
+ use crate::startup_data;
use crate::tokio_util;
use futures::future::lazy;
use std::thread;
@@ -180,6 +177,7 @@ mod tests {
fn test_spawn() {
tokio_util::init(|| {
let worker_result = spawn(
+ startup_data::compiler_isolate_init(),
CompilerBehavior::new(
IsolateState::mock().flags.clone(),
IsolateState::mock().argv.clone(),
@@ -242,6 +240,7 @@ mod tests {
fn removed_from_resource_table_on_close() {
tokio_util::init(|| {
let worker_result = spawn(
+ startup_data::compiler_isolate_init(),
CompilerBehavior::new(
IsolateState::mock().flags.clone(),
IsolateState::mock().argv.clone(),