diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/core_isolate.rs | 13 | ||||
| -rw-r--r-- | core/lib.rs | 1 | ||||
| -rw-r--r-- | core/ops.rs | 88 |
3 files changed, 67 insertions, 35 deletions
diff --git a/core/core_isolate.rs b/core/core_isolate.rs index ffe75c00c..c9e718d2d 100644 --- a/core/core_isolate.rs +++ b/core/core_isolate.rs @@ -348,10 +348,11 @@ impl CoreIsolate { /// corresponds to the second argument of Deno.core.dispatch(). /// /// Requires runtime to explicitly ask for op ids before using any of the ops. - pub fn register_op<F>(&mut self, name: &str, op: F) -> OpId - where - F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static, - { + pub fn register_op( + &mut self, + name: &str, + op: impl OpDispatcher + 'static, + ) -> OpId { let state_rc = Self::state(self); let mut state = state_rc.borrow_mut(); state.op_registry.register(name, op) @@ -466,7 +467,7 @@ impl CoreIsolateState { /// Requires runtime to explicitly ask for op ids before using any of the ops. pub fn register_op<F>(&mut self, name: &str, op: F) -> OpId where - F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static, + F: OpDispatcher + 'static, { self.op_registry.register(name, op) } @@ -488,7 +489,7 @@ impl CoreIsolateState { zero_copy_bufs: &mut [ZeroCopyBuf], ) -> Option<(OpId, Box<[u8]>)> { let op = if let Some(dispatcher) = self.op_registry.get(op_id) { - dispatcher(self, zero_copy_bufs) + dispatcher.dispatch(self, zero_copy_bufs) } else { let message = v8::String::new(scope, &format!("Unknown op id: {}", op_id)).unwrap(); diff --git a/core/lib.rs b/core/lib.rs index 7358af1c4..f348ed6cf 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -46,6 +46,7 @@ pub use crate::modules::RecursiveModuleLoad; pub use crate::ops::Buf; pub use crate::ops::Op; pub use crate::ops::OpAsyncFuture; +pub use crate::ops::OpDispatcher; pub use crate::ops::OpId; pub use crate::resources::ResourceTable; pub use crate::zero_copy_buf::ZeroCopyBuf; diff --git a/core/ops.rs b/core/ops.rs index 65a0f325b..8aa13936b 100644 --- a/core/ops.rs +++ b/core/ops.rs @@ -20,31 +20,52 @@ pub enum Op { AsyncUnref(OpAsyncFuture), } -/// Main type describing op -pub type OpDispatcher = - dyn Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static; +pub trait OpDispatcher { + fn dispatch( + &self, + isolate: &mut CoreIsolateState, + buf: &mut [ZeroCopyBuf], + ) -> Op; +} + +impl<F> OpDispatcher for F +where + F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op, +{ + fn dispatch( + &self, + isolate: &mut CoreIsolateState, + buf: &mut [ZeroCopyBuf], + ) -> Op { + self(isolate, buf) + } +} #[derive(Default)] pub struct OpRegistry { - dispatchers: Vec<Rc<OpDispatcher>>, + dispatchers: Vec<Rc<dyn OpDispatcher>>, name_to_id: HashMap<String, OpId>, } impl OpRegistry { pub fn new() -> Self { let mut registry = Self::default(); - let op_id = registry.register("ops", |state, _| { - let buf = state.op_registry.json_map(); - Op::Sync(buf) - }); + let op_id = registry.register( + "ops", + |state: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| { + let buf = state.op_registry.json_map(); + Op::Sync(buf) + }, + ); assert_eq!(op_id, 0); registry } - pub fn register<F>(&mut self, name: &str, op: F) -> OpId - where - F: Fn(&mut CoreIsolateState, &mut [ZeroCopyBuf]) -> Op + 'static, - { + pub fn register( + &mut self, + name: &str, + op: impl OpDispatcher + 'static, + ) -> OpId { let op_id = self.dispatchers.len() as u32; let existing = self.name_to_id.insert(name.to_string(), op_id); @@ -61,8 +82,8 @@ impl OpRegistry { op_map_json.as_bytes().to_owned().into_boxed_slice() } - pub fn get(&self, op_id: OpId) -> Option<Rc<OpDispatcher>> { - self.dispatchers.get(op_id as usize).map(Rc::clone) + pub fn get(&self, op_id: OpId) -> Option<Rc<dyn OpDispatcher>> { + self.dispatchers.get(op_id as usize).cloned() } pub fn unregister_op(&mut self, name: &str) { @@ -81,10 +102,13 @@ fn test_op_registry() { let c = Arc::new(atomic::AtomicUsize::new(0)); let c_ = c.clone(); - let test_id = op_registry.register("test", move |_, _| { - c_.fetch_add(1, atomic::Ordering::SeqCst); - Op::Sync(Box::new([])) - }); + let test_id = op_registry.register( + "test", + move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| { + c_.fetch_add(1, atomic::Ordering::SeqCst); + Op::Sync(Box::new([])) + }, + ); assert!(test_id != 0); let mut expected = HashMap::new(); @@ -97,7 +121,7 @@ fn test_op_registry() { let dispatch = op_registry.get(test_id).unwrap(); let state_rc = CoreIsolate::state(&isolate); let mut state = state_rc.borrow_mut(); - let res = dispatch(&mut state, &mut []); + let res = dispatch.dispatch(&mut state, &mut []); if let Op::Sync(buf) = res { assert_eq!(buf.len(), 0); } else { @@ -127,15 +151,21 @@ fn register_op_during_call() { let test_id = { let mut g = op_registry.lock().unwrap(); - g.register("dynamic_register_op", move |_, _| { - let c__ = c_.clone(); - let mut g = op_registry_.lock().unwrap(); - g.register("test", move |_, _| { - c__.fetch_add(1, atomic::Ordering::SeqCst); + g.register( + "dynamic_register_op", + move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| { + let c__ = c_.clone(); + let mut g = op_registry_.lock().unwrap(); + g.register( + "test", + move |_: &mut CoreIsolateState, _: &mut [ZeroCopyBuf]| { + c__.fetch_add(1, atomic::Ordering::SeqCst); + Op::Sync(Box::new([])) + }, + ); Op::Sync(Box::new([])) - }); - Op::Sync(Box::new([])) - }) + }, + ) }; assert!(test_id != 0); @@ -148,7 +178,7 @@ fn register_op_during_call() { { let state_rc = CoreIsolate::state(&isolate); let mut state = state_rc.borrow_mut(); - dispatcher1(&mut state, &mut []); + dispatcher1.dispatch(&mut state, &mut []); } let mut expected = HashMap::new(); @@ -166,7 +196,7 @@ fn register_op_during_call() { }; let state_rc = CoreIsolate::state(&isolate); let mut state = state_rc.borrow_mut(); - let res = dispatcher2(&mut state, &mut []); + let res = dispatcher2.dispatch(&mut state, &mut []); if let Op::Sync(buf) = res { assert_eq!(buf.len(), 0); } else { |