diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2020-05-29 17:41:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 17:41:39 -0400 |
| commit | d4b05dd89e94ed1bba5b24c683da0a895f2ce597 (patch) | |
| tree | 7e098257f5558a624e1d691f92c4d6d4cef56667 /cli/ops/signal.rs | |
| parent | 106b00173806e088472e123d04fdc8d260c3820d (diff) | |
refactor: Split isolate and state using safe get_slot() (#5929)
Diffstat (limited to 'cli/ops/signal.rs')
| -rw-r--r-- | cli/ops/signal.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cli/ops/signal.rs b/cli/ops/signal.rs index ef652bc67..7a0c29ab0 100644 --- a/cli/ops/signal.rs +++ b/cli/ops/signal.rs @@ -3,6 +3,7 @@ use super::dispatch_json::{JsonOp, Value}; use crate::op_error::OpError; use crate::state::State; use deno_core::CoreIsolate; +use deno_core::CoreIsolateState; use deno_core::ZeroCopyBuf; #[cfg(unix)] @@ -39,14 +40,14 @@ struct SignalArgs { #[cfg(unix)] fn op_signal_bind( - isolate: &mut CoreIsolate, + isolate_state: &mut CoreIsolateState, state: &State, args: Value, _zero_copy: Option<ZeroCopyBuf>, ) -> Result<JsonOp, OpError> { state.check_unstable("Deno.signal"); let args: BindSignalArgs = serde_json::from_value(args)?; - let mut resource_table = isolate.resource_table.borrow_mut(); + let mut resource_table = isolate_state.resource_table.borrow_mut(); let rid = resource_table.add( "signal", Box::new(SignalStreamResource( @@ -61,7 +62,7 @@ fn op_signal_bind( #[cfg(unix)] fn op_signal_poll( - isolate: &mut CoreIsolate, + isolate_state: &mut CoreIsolateState, state: &State, args: Value, _zero_copy: Option<ZeroCopyBuf>, @@ -69,7 +70,7 @@ fn op_signal_poll( state.check_unstable("Deno.signal"); let args: SignalArgs = serde_json::from_value(args)?; let rid = args.rid as u32; - let resource_table = isolate.resource_table.clone(); + let resource_table = isolate_state.resource_table.clone(); let future = poll_fn(move |cx| { let mut resource_table = resource_table.borrow_mut(); @@ -88,7 +89,7 @@ fn op_signal_poll( #[cfg(unix)] pub fn op_signal_unbind( - isolate: &mut CoreIsolate, + isolate_state: &mut CoreIsolateState, state: &State, args: Value, _zero_copy: Option<ZeroCopyBuf>, @@ -96,7 +97,7 @@ pub fn op_signal_unbind( state.check_unstable("Deno.signal"); let args: SignalArgs = serde_json::from_value(args)?; let rid = args.rid as u32; - let mut resource_table = isolate.resource_table.borrow_mut(); + let mut resource_table = isolate_state.resource_table.borrow_mut(); let resource = resource_table.get::<SignalStreamResource>(rid); if let Some(signal) = resource { if let Some(waker) = &signal.1 { @@ -113,7 +114,7 @@ pub fn op_signal_unbind( #[cfg(not(unix))] pub fn op_signal_bind( - _isolate: &mut CoreIsolate, + _isolate_state: &mut CoreIsolateState, _state: &State, _args: Value, _zero_copy: Option<ZeroCopyBuf>, @@ -123,7 +124,7 @@ pub fn op_signal_bind( #[cfg(not(unix))] fn op_signal_unbind( - _isolate: &mut CoreIsolate, + _isolate_state: &mut CoreIsolateState, _state: &State, _args: Value, _zero_copy: Option<ZeroCopyBuf>, @@ -133,7 +134,7 @@ fn op_signal_unbind( #[cfg(not(unix))] fn op_signal_poll( - _isolate: &mut CoreIsolate, + _isolate_state: &mut CoreIsolateState, _state: &State, _args: Value, _zero_copy: Option<ZeroCopyBuf>, |