diff options
| -rw-r--r-- | cli/standalone.rs | 1 | ||||
| -rw-r--r-- | cli/worker.rs | 2 | ||||
| -rw-r--r-- | core/gotham_state.rs | 4 | ||||
| -rw-r--r-- | core/ops.rs | 4 | ||||
| -rw-r--r-- | core/runtime.rs | 18 | ||||
| -rw-r--r-- | runtime/examples/hello_runtime.rs | 1 | ||||
| -rw-r--r-- | runtime/worker.rs | 3 |
7 files changed, 0 insertions, 33 deletions
diff --git a/cli/standalone.rs b/cli/standalone.rs index 6d2c7551a..ecf295924 100644 --- a/cli/standalone.rs +++ b/cli/standalone.rs @@ -301,7 +301,6 @@ pub async fn run( shared_array_buffer_store: None, compiled_wasm_module_store: None, stdio: Default::default(), - leak_isolate: true, }; let mut worker = MainWorker::bootstrap_from_options( main_module.clone(), diff --git a/cli/worker.rs b/cli/worker.rs index 33352a2d7..97794caf3 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -548,7 +548,6 @@ async fn create_main_worker_internal( shared_array_buffer_store: Some(ps.shared_array_buffer_store.clone()), compiled_wasm_module_store: Some(ps.compiled_wasm_module_store.clone()), stdio, - leak_isolate: !bench_or_test && ps.options.coverage_dir().is_none(), }; let mut worker = MainWorker::bootstrap_from_options( @@ -778,7 +777,6 @@ mod tests { shared_array_buffer_store: None, compiled_wasm_module_store: None, stdio: Default::default(), - leak_isolate: false, }; MainWorker::bootstrap_from_options(main_module, permissions, options) diff --git a/core/gotham_state.rs b/core/gotham_state.rs index 43019eabb..422499f2f 100644 --- a/core/gotham_state.rs +++ b/core/gotham_state.rs @@ -76,10 +76,6 @@ impl GothamState { pub fn take<T: 'static>(&mut self) -> T { self.try_take().unwrap_or_else(|| missing::<T>()) } - - pub fn clear(&mut self) { - self.data.clear(); - } } fn missing<T: 'static>() -> ! { diff --git a/core/ops.rs b/core/ops.rs index b2442634e..ca465c821 100644 --- a/core/ops.rs +++ b/core/ops.rs @@ -179,10 +179,6 @@ impl OpState { tracker: OpsTracker::new(ops_count), } } - - pub fn clear_state(&mut self) { - self.gotham_state.clear(); - } } impl Deref for OpState { diff --git a/core/runtime.rs b/core/runtime.rs index 75bdb4519..c3768d5fa 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -92,9 +92,6 @@ pub struct JsRuntime { event_loop_middlewares: Vec<Box<OpEventLoopFn>>, // Marks if this is considered the top-level runtime. Used only be inspector. is_main: bool, - // Marks if it's OK to leak the current isolate. Use only by the - // CLI main worker. - leak_isolate: bool, } pub(crate) struct DynImportModEvaluate { @@ -299,10 +296,6 @@ pub struct RuntimeOptions { /// Describe if this is the main runtime instance, used by debuggers in some /// situation - like disconnecting when program finishes running. pub is_main: bool, - - /// Whether it is OK to leak the V8 isolate. Only to be used by CLI - /// top-level runtime. - pub leak_isolate: bool, } #[derive(Copy, Clone, PartialEq, Eq)] @@ -336,16 +329,6 @@ impl Drop for JsRuntime { if let Some(v8_isolate) = self.v8_isolate.as_mut() { Self::drop_state_and_module_map(v8_isolate); } - if self.leak_isolate { - if let Some(v8_isolate) = self.v8_isolate.take() { - // Clear the GothamState. This allows final env cleanup hooks to run. - // Note: that OpState is cloned for every OpCtx, so we can't just drop - // one reference to it. - let rc_state = self.op_state(); - rc_state.borrow_mut().clear_state(); - std::mem::forget(v8_isolate); - } - } } } @@ -683,7 +666,6 @@ impl JsRuntime { state: state_rc, module_map: Some(module_map_rc), is_main: options.is_main, - leak_isolate: options.leak_isolate, }; // Init resources and ops before extensions to make sure they are diff --git a/runtime/examples/hello_runtime.rs b/runtime/examples/hello_runtime.rs index 1f09551a6..b8b152467 100644 --- a/runtime/examples/hello_runtime.rs +++ b/runtime/examples/hello_runtime.rs @@ -65,7 +65,6 @@ async fn main() -> Result<(), AnyError> { shared_array_buffer_store: None, compiled_wasm_module_store: None, stdio: Default::default(), - leak_isolate: true, }; let js_path = diff --git a/runtime/worker.rs b/runtime/worker.rs index 7ce6eb58d..4bf7b00e8 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -131,7 +131,6 @@ pub struct WorkerOptions { /// `WebAssembly.Module` objects cannot be serialized. pub compiled_wasm_module_store: Option<CompiledWasmModuleStore>, pub stdio: Stdio, - pub leak_isolate: bool, } impl Default for WorkerOptions { @@ -167,7 +166,6 @@ impl Default for WorkerOptions { startup_snapshot: Default::default(), bootstrap: Default::default(), stdio: Default::default(), - leak_isolate: false, } } } @@ -290,7 +288,6 @@ impl MainWorker { extensions, inspector: options.maybe_inspector_server.is_some(), is_main: true, - leak_isolate: options.leak_isolate, ..Default::default() }); |