Take into account requirements for "isolate" or single-threaded runtimes

.github/workflows/test.yaml

@@ -632,6 +632,7 @@ jobs:
         shell: bash
         run: |
           echo "RUSTFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV
+          echo "RUSTDOCFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV
       - name: Setup Rust target
         shell: bash
         run: |
@@ -849,6 +850,7 @@ jobs:
         shell: bash
         run: |
           echo "RUSTFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV
+          echo "RUSTDOCFLAGS=-L/opt/homebrew/lib" >> $GITHUB_ENV
       - name: Setup Rust target
         shell: bash
         run: |

lib/api/Cargo.toml

@@ -45,6 +45,7 @@ wasmi_c_api = { version = "0.40.0", package = "wasmi_c_api_impl", optional = tru
 	"prefix-symbols",
 ] }
 
+
 seq-macro = { version = "0.3.5", optional = true }
 loupe = { version = "0.1.3", optional = true, features = [
 	"indexmap",

lib/api/src/entities/engine/inner.rs

@@ -13,6 +13,24 @@ use crate::{
 gen_rt_ty!(Engine @derives Debug, Clone);
 
 impl RuntimeEngine {
+    /// Returns the [`crate::Runtime`] kind this engine belongs to.
+    pub fn get_rt_kind(&self) -> crate::RuntimeKind {
+        match self {
+            #[cfg(feature = "sys")]
+            Self::Sys(_) => crate::RuntimeKind::Sys,
+            #[cfg(feature = "v8")]
+            Self::V8(_) => crate::RuntimeKind::V8,
+            #[cfg(feature = "wamr")]
+            Self::Wamr(_) => crate::RuntimeKind::Wamr,
+            #[cfg(feature = "wasmi")]
+            Self::Wasmi(_) => crate::RuntimeKind::Wasmi,
+            #[cfg(feature = "js")]
+            Self::Js(_) => crate::RuntimeKind::Js,
+            #[cfg(feature = "jsc")]
+            Self::Jsc(_) => crate::RuntimeKind::Jsc,
+        }
+    }
+
     /// Returns the deterministic id of this engine.
     pub fn deterministic_id(&self) -> &str {
         match_rt!(on self  => s {

lib/api/src/entities/engine/mod.rs

@@ -48,6 +48,11 @@ impl Engine {
         ENGINE_ID_COUNTER.fetch_add(1, std::sync::atomic::Ordering::SeqCst)
     }
 
+    /// Returns the [`crate::RuntimeKind`] kind this engine belongs to.
+    pub fn get_rt_kind(&self) -> crate::RuntimeKind {
+        self.rt.get_rt_kind()
+    }
+
     /// Returns the deterministic id of this engine.
     pub fn deterministic_id(&self) -> &str {
         self.rt.deterministic_id()

lib/api/src/entities/function/host/imp.rs

@@ -21,31 +21,31 @@ impl< $( $x, )* Rets, RetsAsResult, T, Func> crate::HostFunction<T, ( $( $x ),*
 {
 
   #[allow(non_snake_case)]
-  fn function_callback(&self, rt: crate::rt::Runtime) -> crate::vm::VMFunctionCallback {
+  fn function_callback(&self, rt: crate::rt::RuntimeKind) -> crate::vm::VMFunctionCallback {
       paste::paste!{
       match rt {
           #[cfg(feature = "sys")]
-          crate::rt::Runtime::Sys => crate::vm::VMFunctionCallback::Sys(crate::rt::sys::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
+          crate::rt::RuntimeKind::Sys => crate::vm::VMFunctionCallback::Sys(crate::rt::sys::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
           #[cfg(feature = "js")]
-          crate::rt::Runtime::Js => crate::vm::VMFunctionCallback::Js(crate::rt::js::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
+          crate::rt::RuntimeKind::Js => crate::vm::VMFunctionCallback::Js(crate::rt::js::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
           #[cfg(feature = "jsc")]
-          crate::rt::Runtime::Jsc => crate::vm::VMFunctionCallback::Jsc(crate::rt::jsc::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
+          crate::rt::RuntimeKind::Jsc => crate::vm::VMFunctionCallback::Jsc(crate::rt::jsc::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
           #[cfg(feature = "wamr")]
-          crate::rt::Runtime::Wamr => crate::vm::VMFunctionCallback::Wamr(crate::rt::wamr::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
+          crate::rt::RuntimeKind::Wamr => crate::vm::VMFunctionCallback::Wamr(crate::rt::wamr::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
           #[cfg(feature = "wasmi")]
-          crate::rt::Runtime::Wasmi => crate::vm::VMFunctionCallback::Wasmi(crate::rt::wasmi::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
+          crate::rt::RuntimeKind::Wasmi => crate::vm::VMFunctionCallback::Wasmi(crate::rt::wasmi::function::[<gen_fn_callback_ $c_struct_name:lower >](self)),
           #[cfg(feature = "v8")]
-          crate::rt::Runtime::V8 => crate::vm::VMFunctionCallback::V8(crate::rt::v8::function::[<gen_fn_callback_ $c_struct_name:lower >](self))
+          crate::rt::RuntimeKind::V8 => crate::vm::VMFunctionCallback::V8(crate::rt::v8::function::[<gen_fn_callback_ $c_struct_name:lower >](self))
       }
       }
   }
 
   #[allow(non_snake_case)]
-  fn call_trampoline_address(rt: crate::rt::Runtime) -> crate::vm::VMTrampoline {
+  fn call_trampoline_address(rt: crate::rt::RuntimeKind) -> crate::vm::VMTrampoline {
       paste::paste!{
       match rt {
           #[cfg(feature = "sys")]
-          crate::rt::Runtime::Sys => crate::vm::VMTrampoline::Sys(crate::rt::sys::function::[<gen_call_trampoline_address_ $c_struct_name:lower >]::<$($x,)* Rets>()),
+          crate::rt::RuntimeKind::Sys => crate::vm::VMTrampoline::Sys(crate::rt::sys::function::[<gen_call_trampoline_address_ $c_struct_name:lower >]::<$($x,)* Rets>()),
           _ => unimplemented!()
       }
       }
@@ -68,31 +68,31 @@ where
 
 
   #[allow(non_snake_case)]
-  fn function_callback(&self, rt: crate::rt::Runtime) -> crate::vm::VMFunctionCallback {
+  fn function_callback(&self, rt: crate::rt::RuntimeKind) -> crate::vm::VMFunctionCallback {
     paste::paste!{
       match rt {
           #[cfg(feature = "sys")]
-          crate::rt::Runtime::Sys => crate::vm::VMFunctionCallback::Sys(crate::rt::sys::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
+          crate::rt::RuntimeKind::Sys => crate::vm::VMFunctionCallback::Sys(crate::rt::sys::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
           #[cfg(feature = "js")]
-          crate::rt::Runtime::Js => crate::vm::VMFunctionCallback::Js(crate::rt::js::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
+          crate::rt::RuntimeKind::Js => crate::vm::VMFunctionCallback::Js(crate::rt::js::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
           #[cfg(feature = "jsc")]
-          crate::rt::Runtime::Jsc => crate::vm::VMFunctionCallback::Jsc(crate::rt::jsc::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
+          crate::rt::RuntimeKind::Jsc => crate::vm::VMFunctionCallback::Jsc(crate::rt::jsc::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
           #[cfg(feature = "wamr")]
-          crate::rt::Runtime::Wamr => crate::vm::VMFunctionCallback::Wamr(crate::rt::wamr::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
+          crate::rt::RuntimeKind::Wamr => crate::vm::VMFunctionCallback::Wamr(crate::rt::wamr::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
           #[cfg(feature = "wasmi")]
-          crate::rt::Runtime::Wasmi => crate::vm::VMFunctionCallback::Wasmi(crate::rt::wasmi::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
+          crate::rt::RuntimeKind::Wasmi => crate::vm::VMFunctionCallback::Wasmi(crate::rt::wasmi::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self)),
           #[cfg(feature = "v8")]
-          crate::rt::Runtime::V8 => crate::vm::VMFunctionCallback::V8(crate::rt::v8::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self))
+          crate::rt::RuntimeKind::V8 => crate::vm::VMFunctionCallback::V8(crate::rt::v8::function::[<gen_fn_callback_ $c_struct_name:lower _no_env>](self))
       }
       }
   }
 
   #[allow(non_snake_case)]
-  fn call_trampoline_address(rt: crate::rt::Runtime) -> crate::vm::VMTrampoline {
+  fn call_trampoline_address(rt: crate::rt::RuntimeKind) -> crate::vm::VMTrampoline {
     paste::paste!{
           match rt {
               #[cfg(feature = "sys")]
-              crate::rt::Runtime::Sys => crate::vm::VMTrampoline::Sys(crate::rt::sys::function::[<gen_call_trampoline_address_ $c_struct_name:lower _no_env>]::<$($x,)* Rets>()),
+              crate::rt::RuntimeKind::Sys => crate::vm::VMTrampoline::Sys(crate::rt::sys::function::[<gen_call_trampoline_address_ $c_struct_name:lower _no_env>]::<$($x,)* Rets>()),
               _ => unimplemented!()
           }
           }

lib/api/src/entities/function/host/mod.rs

@@ -2,7 +2,7 @@ mod imp;
 
 use crate::{
     vm::{VMFunctionCallback, VMTrampoline},
-    Runtime, WasmTypeList,
+    RuntimeKind, WasmTypeList,
 };
 
 /// The `HostFunction` trait represents the set of functions that
@@ -16,10 +16,10 @@ where
     Kind: HostFunctionKind,
 {
     /// Get the pointer to the function body for a given runtime.
-    fn function_callback(&self, rt: Runtime) -> crate::vm::VMFunctionCallback;
+    fn function_callback(&self, rt: RuntimeKind) -> crate::vm::VMFunctionCallback;
 
     /// Get the pointer to the function call trampoline for a given runtime.
-    fn call_trampoline_address(rt: Runtime) -> crate::vm::VMTrampoline;
+    fn call_trampoline_address(rt: RuntimeKind) -> crate::vm::VMTrampoline;
 }
 
 /// Empty trait to specify the kind of `HostFunction`: With or

lib/api/src/rt/js/entities/engine.rs

@@ -44,6 +44,11 @@ impl crate::Engine {
             _ => panic!("Not a `js` engine!"),
         }
     }
+
+    /// Return true if [`self`] is an engine from the `js` runtime.
+    pub fn is_js(&self) -> bool {
+        matches!(self.rt, crate::RuntimeEngine::Js(_))
+    }
 }
 
 impl Into<crate::Engine> for Engine {

lib/api/src/rt/js/entities/function/mod.rs

@@ -320,7 +320,7 @@ where
         T: Sized,
     {
         Self {
-            address: function.function_callback(crate::Runtime::Js).into_js(),
+            address: function.function_callback(crate::RuntimeKind::Js).into_js(),
             _phantom: PhantomData,
         }
     }

lib/api/src/rt/jsc/entities/engine.rs

@@ -240,6 +240,11 @@ impl crate::Engine {
             _ => panic!("Not a `jsc` engine!"),
         }
     }
+
+    /// Return true if [`self`] is an engine from the `jsc` runtime.
+    pub fn is_jsc(&self) -> bool {
+        matches!(self.rt, crate::RuntimeEngine::Jsc(_))
+    }
 }
 
 impl Into<crate::Engine> for Engine {

lib/api/src/rt/jsc/entities/function/mod.rs

@@ -313,7 +313,9 @@ where
         T: Sized,
     {
         Self {
-            callback: function.function_callback(crate::Runtime::Jsc).into_jsc(),
+            callback: function
+                .function_callback(crate::RuntimeKind::Jsc)
+                .into_jsc(),
             _phantom: PhantomData,
         }
     }

lib/api/src/rt/mod.rs

@@ -19,9 +19,10 @@ pub mod js;
 #[cfg(feature = "jsc")]
 pub mod jsc;
 
+#[non_exhaustive]
 #[derive(Debug, Clone, Copy)]
 /// An enumeration over all the supported runtimes.
-pub enum Runtime {
+pub enum RuntimeKind {
     #[cfg(feature = "sys")]
     /// The `sys` runtime.
     Sys,

lib/api/src/rt/sys/entities/function/mod.rs

@@ -132,7 +132,7 @@ impl Function {
         Rets: WasmTypeList,
     {
         let env = FunctionEnv::new(store, ());
-        let func_ptr = func.function_callback(crate::Runtime::Sys).into_sys();
+        let func_ptr = func.function_callback(crate::RuntimeKind::Sys).into_sys();
         let host_data = Box::new(StaticFunction {
             raw_store: store.as_store_mut().as_raw() as *mut u8,
             env,
@@ -150,7 +150,7 @@ impl Function {
         };
         let call_trampoline =
             <F as HostFunction<(), Args, Rets, WithoutEnv>>::call_trampoline_address(
-                crate::Runtime::Sys,
+                crate::RuntimeKind::Sys,
             )
             .into_sys();
         let anyfunc = VMCallerCheckedAnyfunc {
@@ -181,7 +181,7 @@ impl Function {
         Args: WasmTypeList,
         Rets: WasmTypeList,
     {
-        let func_ptr = func.function_callback(crate::Runtime::Sys).into_sys();
+        let func_ptr = func.function_callback(crate::RuntimeKind::Sys).into_sys();
         let host_data = Box::new(StaticFunction {
             raw_store: store.as_store_mut().as_raw() as *mut u8,
             env: env.as_sys().clone().into(),
@@ -198,7 +198,7 @@ impl Function {
             host_env: host_data.as_ref() as *const _ as *mut c_void,
         };
         let call_trampoline = <F as HostFunction<T, Args, Rets, WithEnv>>::call_trampoline_address(
-            crate::Runtime::Sys,
+            crate::RuntimeKind::Sys,
         )
         .into_sys();
         let anyfunc = VMCallerCheckedAnyfunc {

lib/api/src/rt/v8/entities/function/mod.rs

@@ -17,7 +17,7 @@ use crate::{
     RuntimeTrap, StoreMut, Value, WasmTypeList, WithEnv, WithoutEnv,
 };
 
-use super::{super::error::Trap, store::StoreHandle};
+use super::{super::error::Trap, check_isolate, store::StoreHandle};
 use wasmer_types::{FunctionType, RawValue};
 
 pub(crate) mod env;
@@ -82,6 +82,10 @@ impl Function {
             + Send
             + Sync,
     {
+        check_isolate(store);
+
+        let mut store = store.as_store_mut();
+        let v8_store = store.inner.store.as_v8();
         let fn_ty: FunctionType = ty.into();
         let params = fn_ty.params();
 
@@ -121,8 +125,7 @@ impl Function {
             )
         };
 
-        let mut store = store.as_store_mut();
-        let inner = store.inner.store.as_v8().inner;
+        let inner = v8_store.inner;
 
         let callback: CCallback = make_fn_callback(&func, param_types.len());
 
@@ -159,6 +162,10 @@ impl Function {
         Args: WasmTypeList,
         Rets: WasmTypeList,
     {
+        check_isolate(store);
+        let mut store = store.as_store_mut();
+        let v8_store = store.inner.store.as_v8();
+
         let mut param_types = Args::wasm_types()
             .into_iter()
             .map(|param| {
@@ -190,11 +197,11 @@ impl Function {
         let wasm_functype =
             unsafe { wasm_functype_new(&mut wasm_param_types, &mut wasm_result_types) };
 
-        let mut store = store.as_store_mut();
-        let inner = store.inner.store.as_v8().inner;
+        let inner = v8_store.inner;
 
-        let callback: CCallback =
-            unsafe { std::mem::transmute(func.function_callback(crate::Runtime::V8).into_v8()) };
+        let callback: CCallback = unsafe {
+            std::mem::transmute(func.function_callback(crate::RuntimeKind::V8).into_v8())
+        };
 
         let mut callback_env: *mut FunctionCallbackEnv<'_, F> =
             Box::into_raw(Box::new(FunctionCallbackEnv {
@@ -233,6 +240,10 @@ impl Function {
         Rets: WasmTypeList,
         T: Send + 'static,
     {
+        check_isolate(store);
+        let mut store = store.as_store_mut();
+        let v8_store = store.inner.store.as_v8();
+
         let mut param_types = Args::wasm_types()
             .into_iter()
             .map(|param| {
@@ -268,11 +279,11 @@ impl Function {
             )
         };
 
-        let mut store = store.as_store_mut();
-        let inner = store.inner.store.as_v8().inner;
+        let inner = v8_store.inner;
 
-        let callback: CCallback =
-            unsafe { std::mem::transmute(func.function_callback(crate::Runtime::V8).into_v8()) };
+        let callback: CCallback = unsafe {
+            std::mem::transmute(func.function_callback(crate::RuntimeKind::V8).into_v8())
+        };
 
         let mut callback_env: *mut FunctionCallbackEnv<'_, F> =
             Box::into_raw(Box::new(FunctionCallbackEnv {
@@ -300,7 +311,9 @@ impl Function {
         }
     }
 
-    pub fn ty(&self, _store: &impl AsStoreRef) -> FunctionType {
+    pub fn ty(&self, store: &impl AsStoreRef) -> FunctionType {
+        check_isolate(store);
+        let store_ref = store.as_store_ref();
         let type_ = unsafe { wasm_func_type(self.handle) };
         let params: *const wasm_valtype_vec_t = unsafe { wasm_functype_params(type_) };
         let returns: *const wasm_valtype_vec_t = unsafe { wasm_functype_results(type_) };
@@ -340,6 +353,7 @@ impl Function {
         store: &mut impl AsStoreMut,
         params: &[Value],
     ) -> Result<Box<[Value]>, RuntimeError> {
+        check_isolate(store);
         let store_mut = store.as_store_mut();
 
         let mut args = {
@@ -366,7 +380,34 @@ impl Function {
             ptr
         };
 
-        let trap = unsafe { wasm_func_call(self.handle, args as *const _, results as *mut _) };
+        let mut trap;
+
+        loop {
+            trap = unsafe { wasm_func_call(self.handle, args as *const _, results) };
+            let store_mut = store.as_store_mut();
+            if let Some(callback) = store_mut.inner.on_called.take() {
+                match callback(store_mut) {
+                    Ok(wasmer_types::OnCalledAction::InvokeAgain) => {
+                        continue;
+                    }
+                    Ok(wasmer_types::OnCalledAction::Finish) => {
+                        break;
+                    }
+                    Ok(wasmer_types::OnCalledAction::Trap(trap)) => {
+                        return Err(RuntimeError::user(trap))
+                    }
+                    Err(trap) => return Err(RuntimeError::user(trap)),
+                }
+            }
+            break;
+        }
+
+        if !trap.is_null() {
+            unsafe {
+                let trap: Trap = trap.into();
+                return Err(RuntimeError::from(trap));
+            }
+        }
 
         if !trap.is_null() {
             return Err(Into::<Trap>::into(trap).into());