renamed WebWorkerBehavior to UserWorkerBehaivor and moved to workers.rs

cli/isolate_state.rs

@@ -6,7 +6,7 @@ use crate::global_timer::GlobalTimer;
 use crate::modules::Modules;
 use crate::permissions::DenoPermissions;
 use crate::resources::ResourceId;
-use crate::web_worker_behavior::WebWorkerBehavior;
+use crate::workers::UserWorkerBehavior;
 use crate::workers::Worker;
 use deno_core::Buf;
 use futures::future::Shared;
@@ -21,8 +21,8 @@ use std::sync::Mutex;
 pub type WorkerSender = async_mpsc::Sender<Buf>;
 pub type WorkerReceiver = async_mpsc::Receiver<Buf>;
 pub type WorkerChannels = (WorkerSender, WorkerReceiver);
-pub type WebWorkerTable =
- HashMap<ResourceId, Shared<Worker<WebWorkerBehavior>>>;
+pub type UserWorkerTable =
+ HashMap<ResourceId, Shared<Worker<UserWorkerBehavior>>>;
 
 // AtomicU64 is currently unstable
 #[derive(Default)]
@@ -49,7 +49,7 @@ pub struct IsolateState {
  pub modules: Mutex<Modules>,
  pub worker_channels: Option<Mutex<WorkerChannels>>,
  pub global_timer: Mutex<GlobalTimer>,
- pub workers: Mutex<WebWorkerTable>,
+ pub workers: Mutex<UserWorkerTable>,
  pub is_worker: bool,
 }
 
@@ -71,7 +71,7 @@ impl IsolateState {
  modules: Mutex::new(Modules::new()),
  worker_channels: worker_channels.map(Mutex::new),
  global_timer: Mutex::new(GlobalTimer::new()),
- workers: Mutex::new(WebWorkerTable::new()),
+ workers: Mutex::new(UserWorkerTable::new()),
  is_worker,
  }
  }

cli/main.rs

@@ -33,7 +33,6 @@ mod startup_data;
 mod tokio_util;
 mod tokio_write;
 pub mod version;
-pub mod web_worker_behavior;
 pub mod workers;
 
 use crate::cli_behavior::CliBehavior;

cli/ops.rs

@@ -18,7 +18,6 @@ use crate::resources::Resource;
 use crate::tokio_util;
 use crate::tokio_write;
 use crate::version;
-use crate::web_worker_behavior;
 use crate::workers;
 use deno_core::deno_buf;
 use deno_core::Buf;
@@ -1838,7 +1837,7 @@ fn op_create_worker(
 
  Box::new(futures::future::result(move || -> OpResult {
  let parent_state = sc.state().clone();
- let behavior = web_worker_behavior::WebWorkerBehavior::new(
+ let behavior = workers::UserWorkerBehavior::new(
  parent_state.flags.clone(),
  parent_state.argv.clone(),
  );

cli/workers.rs

@@ -1,13 +1,72 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 use crate::errors::*;
+use crate::flags::DenoFlags;
 use crate::isolate::{DenoBehavior, Isolate};
+use crate::isolate_state::IsolateState;
+use crate::isolate_state::IsolateStateContainer;
 use crate::isolate_state::WorkerChannels;
+use crate::ops;
 use crate::resources;
+use crate::startup_data;
+use deno_core::deno_buf;
+use deno_core::Behavior;
 use deno_core::Buf;
 use deno_core::JSError;
+use deno_core::Op;
+use deno_core::StartupData;
 use futures::sync::mpsc;
 use futures::Future;
 use futures::Poll;
+use std::sync::Arc;
+
+pub struct UserWorkerBehavior {
+ pub state: Arc<IsolateState>,
+}
+
+impl UserWorkerBehavior {
+ pub fn new(flags: DenoFlags, argv_rest: Vec<String>) -> Self {
+ Self {
+ state: Arc::new(IsolateState::new(flags, argv_rest, None, true)),
+ }
+ }
+}
+
+impl IsolateStateContainer for UserWorkerBehavior {
+ fn state(&self) -> Arc<IsolateState> {
+ self.state.clone()
+ }
+}
+
+impl IsolateStateContainer for &UserWorkerBehavior {
+ fn state(&self) -> Arc<IsolateState> {
+ self.state.clone()
+ }
+}
+
+impl Behavior for UserWorkerBehavior {
+ fn startup_data(&mut self) -> Option<StartupData> {
+ Some(startup_data::worker_isolate_init())
+ }
+
+ fn dispatch(
+ &mut self,
+ control: &[u8],
+ zero_copy: deno_buf,
+ ) -> (bool, Box<Op>) {
+ ops::dispatch_all(self, control, zero_copy, ops::op_selector_worker)
+ }
+}
+
+impl WorkerBehavior for UserWorkerBehavior {
+ fn set_internal_channels(&mut self, worker_channels: WorkerChannels) {
+ self.state = Arc::new(IsolateState::new(
+ self.state.flags.clone(),
+ self.state.argv.clone(),
+ Some(worker_channels),
+ true,
+ ));
+ }
+}
 
 /// Behavior trait specific to workers
 pub trait WorkerBehavior: DenoBehavior {