diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/bindings.rs | 33 | ||||
| -rw-r--r-- | core/lib.rs | 1 | ||||
| -rw-r--r-- | core/runtime.rs | 69 |
3 files changed, 80 insertions, 23 deletions
diff --git a/core/bindings.rs b/core/bindings.rs index 5d9b0bdb8..3bff22e50 100644 --- a/core/bindings.rs +++ b/core/bindings.rs @@ -665,6 +665,23 @@ impl<'a> v8::ValueSerializerImpl for SerializeDeserialize<'a> { } } + fn get_wasm_module_transfer_id( + &mut self, + scope: &mut HandleScope<'_>, + module: Local<v8::WasmModuleObject>, + ) -> Option<u32> { + let state_rc = JsRuntime::state(scope); + let state = state_rc.borrow_mut(); + if let Some(compiled_wasm_module_store) = &state.compiled_wasm_module_store + { + let compiled_wasm_module = module.get_compiled_module(); + let id = compiled_wasm_module_store.insert(compiled_wasm_module); + Some(id) + } else { + None + } + } + fn write_host_object<'s>( &mut self, scope: &mut v8::HandleScope<'s>, @@ -704,6 +721,22 @@ impl<'a> v8::ValueDeserializerImpl for SerializeDeserialize<'a> { } } + fn get_wasm_module_from_id<'s>( + &mut self, + scope: &mut HandleScope<'s>, + clone_id: u32, + ) -> Option<Local<'s, v8::WasmModuleObject>> { + let state_rc = JsRuntime::state(scope); + let state = state_rc.borrow_mut(); + if let Some(compiled_wasm_module_store) = &state.compiled_wasm_module_store + { + let compiled_module = compiled_wasm_module_store.take(clone_id)?; + v8::WasmModuleObject::from_compiled_module(scope, &compiled_module) + } else { + None + } + } + fn read_host_object<'s>( &mut self, scope: &mut v8::HandleScope<'s>, diff --git a/core/lib.rs b/core/lib.rs index 76b3a4f37..22509c462 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -58,6 +58,7 @@ pub use crate::modules::ModuleLoader; pub use crate::modules::ModuleSource; pub use crate::modules::ModuleSourceFuture; pub use crate::modules::NoopModuleLoader; +pub use crate::runtime::CompiledWasmModuleStore; pub use crate::runtime::SharedArrayBufferStore; // TODO(bartlomieju): this struct should be implementation // detail nad not be public diff --git a/core/runtime.rs b/core/runtime.rs index ddbfea0c1..9a60a65ed 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -99,36 +99,48 @@ struct ModEvaluate { sender: oneshot::Sender<Result<(), AnyError>>, } -#[derive(Default, Clone)] -pub struct SharedArrayBufferStore(Arc<Mutex<SharedArrayBufferStoreInner>>); +pub struct CrossIsolateStore<T>(Arc<Mutex<CrossIsolateStoreInner<T>>>); -#[derive(Default)] -pub struct SharedArrayBufferStoreInner { - buffers: HashMap<u32, v8::SharedRef<v8::BackingStore>>, +struct CrossIsolateStoreInner<T> { + map: HashMap<u32, T>, last_id: u32, } -impl SharedArrayBufferStore { - pub(crate) fn insert( - &self, - backing_store: v8::SharedRef<v8::BackingStore>, - ) -> u32 { - let mut buffers = self.0.lock().unwrap(); - let last_id = buffers.last_id; - buffers.buffers.insert(last_id, backing_store); - buffers.last_id += 1; +impl<T> CrossIsolateStore<T> { + pub(crate) fn insert(&self, value: T) -> u32 { + let mut store = self.0.lock().unwrap(); + let last_id = store.last_id; + store.map.insert(last_id, value); + store.last_id += 1; last_id } - pub(crate) fn take( - &self, - id: u32, - ) -> Option<v8::SharedRef<v8::BackingStore>> { - let mut buffers = self.0.lock().unwrap(); - buffers.buffers.remove(&id) + pub(crate) fn take(&self, id: u32) -> Option<T> { + let mut store = self.0.lock().unwrap(); + store.map.remove(&id) + } +} + +impl<T> Default for CrossIsolateStore<T> { + fn default() -> Self { + CrossIsolateStore(Arc::new(Mutex::new(CrossIsolateStoreInner { + map: Default::default(), + last_id: 0, + }))) } } +impl<T> Clone for CrossIsolateStore<T> { + fn clone(&self) -> Self { + Self(self.0.clone()) + } +} + +pub type SharedArrayBufferStore = + CrossIsolateStore<v8::SharedRef<v8::BackingStore>>; + +pub type CompiledWasmModuleStore = CrossIsolateStore<v8::CompiledWasmModule>; + /// Internal state for JsRuntime which is stored in one of v8::Isolate's /// embedder slots. pub(crate) struct JsRuntimeState { @@ -149,6 +161,7 @@ pub(crate) struct JsRuntimeState { pub(crate) have_unpolled_ops: bool, pub(crate) op_state: Rc<RefCell<OpState>>, pub(crate) shared_array_buffer_store: Option<SharedArrayBufferStore>, + pub(crate) compiled_wasm_module_store: Option<CompiledWasmModuleStore>, waker: AtomicWaker, } @@ -238,11 +251,20 @@ pub struct RuntimeOptions { /// (which it only does once), otherwise it's silenty dropped. pub v8_platform: Option<v8::SharedRef<v8::Platform>>, - /// The buffer to use for transferring SharedArrayBuffers between isolates. + /// The store to use for transferring SharedArrayBuffers between isolates. /// If multiple isolates should have the possibility of sharing - /// SharedArrayBuffers, they should use the same SharedArrayBufferStore. If no - /// SharedArrayBufferStore is specified, SharedArrayBuffer can not be serialized. + /// SharedArrayBuffers, they should use the same [SharedArrayBufferStore]. If + /// no [SharedArrayBufferStore] is specified, SharedArrayBuffer can not be + /// serialized. pub shared_array_buffer_store: Option<SharedArrayBufferStore>, + + /// The store to use for transferring `WebAssembly.Module` objects between + /// isolates. + /// If multiple isolates should have the possibility of sharing + /// `WebAssembly.Module` objects, they should use the same + /// [CompiledWasmModuleStore]. If no [CompiledWasmModuleStore] is specified, + /// `WebAssembly.Module` objects cannot be serialized. + pub compiled_wasm_module_store: Option<CompiledWasmModuleStore>, } impl JsRuntime { @@ -334,6 +356,7 @@ impl JsRuntime { pending_ops: FuturesUnordered::new(), pending_unref_ops: FuturesUnordered::new(), shared_array_buffer_store: options.shared_array_buffer_store, + compiled_wasm_module_store: options.compiled_wasm_module_store, op_state: op_state.clone(), have_unpolled_ops: false, waker: AtomicWaker::new(), |