self-review fixes

Author: ValeryAntopol

Cargo.lock

@@ -60,7 +60,7 @@ impl<
         M: Memory<MV, DelayedContextLifetime<WB>>,
     > Allocatable<MV, DelayedContextLifetime<WB>> for LoHelper<WB, MV, M>
 {
-    fn allocate<'this, 'ctx1: 'this, 'ctx2: 'ctx1>(
+    fn allocate<'this, 'ctx1: 'this, 'ctx2: 'this>(
         &'this mut self,
         store: &'ctx1 mut <WB as WasmBackend>::ContextMut<'ctx2>,
         size: u32,

core/src/host_imports/lowering/lo_helper.rs

@@ -37,8 +37,6 @@ use futures::FutureExt;
 use js_sys::Array;
 use wasm_bindgen::prelude::*;
 
-use std::future::Future;
-
 // Safety: this is safe because its intended to run in single thread
 unsafe impl Send for HostImportFunction {}
 unsafe impl Sync for HostImportFunction {}
@@ -220,12 +218,12 @@ impl HostFunction<JsWasmBackend> for HostImportFunction {
 
     fn new_async<F>(store: &mut impl AsContextMut<JsWasmBackend>, sig: FuncSig, func: F) -> Self
     where
-        F: for<'c> Fn(&'c [WValue]) -> Box<dyn Future<Output = Vec<WValue>> + Send + 'c>
+        F: for<'c> Fn(&'c [WValue]) -> BoxFuture<'c, anyhow::Result<Vec<WValue>>>
             + Sync
             + Send
             + 'static,
     {
-        todo!()
+        Self::new_with_caller_async(store, sig, move |_caller, args| func(args))
     }
 
     fn new_typed<Params, Results, Env>(
@@ -240,19 +238,6 @@ impl HostFunction<JsWasmBackend> for HostImportFunction {
     }
 }
 
-impl AsyncFunction<JsWasmBackend> for HostImportFunction {
-    fn call_async<CTX>(
-        &self,
-        store: &mut CTX,
-        args: &[WValue],
-    ) -> BoxFuture<RuntimeResult<Vec<WValue>>>
-    where
-        CTX: AsContextMut<JsWasmBackend> + Send,
-    {
-        todo!()
-    }
-}
-
 fn wrap_raw_host_fn<F>(
     signature: FuncSig,
     store_inner_ptr: *mut JsStoreInner,

crates/js-backend/src/function.rs

@@ -1,16 +1,14 @@
-use futures::{
-    future::{BoxFuture, FutureExt},
-    task::{waker_ref, ArcWake},
-};
-use std::{
-    future::Future,
-    sync::{Arc},
-    task::Context,
-};
+use marine_wasm_backend_traits::WValue;
+
+use futures::future::BoxFuture;
+use futures::task::waker_ref;
+use futures::task::ArcWake;
 
+use std::future::Future;
 use std::pin::Pin;
+use std::sync::Arc;
+use std::task::Context;
 use std::task::Poll;
-use marine_wasm_backend_traits::WValue;
 
 struct DummyTask();
 impl ArcWake for DummyTask {
@@ -23,6 +21,8 @@ pub(crate) fn execute_future_blocking(
     let task = Arc::new(DummyTask());
     let waker = waker_ref(&task);
     let context = &mut Context::from_waker(&waker);
+
+    #[allow(unused_assignments)]
     let mut result: anyhow::Result<Vec<WValue>> = Ok(Vec::default());
     loop {
         match Pin::new(&mut future).poll(context) {

crates/js-backend/src/single_shot_async_executor.rs

@@ -23,11 +23,9 @@ use crate::WValue;
 
 use futures::future::BoxFuture;
 
-use std::future::Future;
-
 /// A host function ready to be used as an import for instantiating a module.
 /// As it is only a handle to an object in `Store`, cloning is cheap.
-pub trait HostFunction<WB: WasmBackend>: AsyncFunction<WB> + Send + Sync + Clone {
+pub trait HostFunction<WB: WasmBackend>: /*AsyncFunction<WB> + */Send + Sync + Clone {
     /// Creates a new function with dynamic signature.
     /// The signature check is performed at runtime.
     fn new<F>(store: &mut impl AsContextMut<WB>, sig: FuncSig, func: F) -> Self
@@ -59,7 +57,7 @@ pub trait HostFunction<WB: WasmBackend>: AsyncFunction<WB> + Send + Sync + Clone
     /// Creates a new function with dynamic signature that needs a context.
     fn new_async<F>(store: &mut impl AsContextMut<WB>, sig: FuncSig, func: F) -> Self
     where
-        F: for<'c> Fn(&'c [WValue]) -> Box<dyn Future<Output = Vec<WValue>> + Send + 'c>
+        F: for<'c> Fn(&'c [WValue]) -> BoxFuture<'c, anyhow::Result<Vec<WValue>>>
             + Sync
             + Send
             + 'static;
@@ -97,16 +95,6 @@ pub trait ExportFunction<WB: WasmBackend>: Send + Sync + Clone {
     ) -> BoxFuture<'args, RuntimeResult<Vec<WValue>>>;
 }
 
-pub trait AsyncFunction<WB: WasmBackend> {
-    fn call_async<'args, CTX>(
-        &'args self,
-        store: &'args mut CTX,
-        args: &'args [WValue],
-    ) -> BoxFuture<'args, RuntimeResult<Vec<WValue>>>
-    where
-        CTX: AsContextMut<WB> + Send;
-}
-
 /// A helper trait for creating a function with a static signature.
 /// Should not be implemented by users.
 /// Implemented for all functions that meet the following criteria:

crates/wasm-backend-traits/src/function.rs

@@ -24,9 +24,14 @@ use marine_wasm_backend_traits::prelude::*;
 
 use wasmtime::AsContext as WasmtimeAsContext;
 use wasmtime::AsContextMut as WasmtimeAsContextMut;
+
+// these imports are used in the macro `impl_func_getter`, but compiler does not detect it
+#[allow(unused)]
 use futures::future::BoxFuture;
+#[allow(unused)]
 use futures::FutureExt;
 
+#[allow(unused)]
 use std::sync::Arc;
 
 pub struct WasmtimeImportCallContext<'c> {

crates/wasmtime-backend/src/caller.rs

@@ -129,12 +129,12 @@ impl HostFunction<WasmtimeWasmBackend> for WasmtimeFunction {
         func: F,
     ) -> Self
     where
-        F: for<'c> Fn(&'c [WValue]) -> Box<dyn Future<Output = Vec<WValue>> + Send + 'c>
+        F: for<'c> Fn(&'c [WValue]) -> BoxFuture<'c, anyhow::Result<Vec<WValue>>>
             + Sync
             + Send
             + 'static,
     {
-        todo!()
+        Self::new_with_caller_async(store, sig, move |_caller, args| func(args))
     }
 
     fn new_typed<Params, Results, Env>(
@@ -180,36 +180,6 @@ impl ExportFunction<WasmtimeWasmBackend> for WasmtimeFunction {
     }
 }
 
-impl AsyncFunction<WasmtimeWasmBackend> for WasmtimeFunction {
-    fn call_async<'args, CTX>(
-        &'args self,
-        store: &'args mut CTX,
-        args: &'args [WValue],
-    ) -> BoxFuture<'args, RuntimeResult<Vec<WValue>>>
-    where
-        CTX: AsContextMut<WasmtimeWasmBackend> + Send,
-    {
-        async move {
-            let mut context = store.as_context_mut().inner;
-
-            let args = args.iter().map(wvalue_to_val).collect::<Vec<_>>();
-            let results_count = self.inner.ty(&mut context).results().len();
-            let mut results = vec![wasmtime::Val::null(); results_count];
-
-            self.inner
-                .call_async(&mut context, &args, &mut results)
-                .await
-                .map_err(inspect_call_error)?;
-
-            results
-                .iter()
-                .map(val_to_wvalue)
-                .collect::<Result<Vec<_>, _>>()
-        }
-        .boxed()
-    }
-}
-
 /// Generates a function that accepts a Fn with $num template parameters and turns it into WasmtimeFunction.
 /// Needed to allow users to pass almost any function to `Function::new_typed` without worrying about signature.
 macro_rules! impl_func_construction {

crates/wasmtime-backend/src/function.rs

@@ -12,6 +12,7 @@ crate-type = ["cdylib"]
 [dependencies]
 marine-js-backend = {path = "../crates/js-backend", version = "0.2.1"}
 marine-runtime = {path = "../marine",  default-features = false}
+marine-wasm-backend-traits = {path = "../crates/wasm-backend-traits", version = "0.4.0"}
 
 wasm-bindgen = "0.2.86"
 once_cell = "1.18.0"

marine-js/Cargo.toml

@@ -23,6 +23,7 @@ use marine::generic::MarineModuleConfig;
 use marine::generic::ModuleDescriptor;
 use marine::MarineWASIConfig;
 use marine_js_backend::JsWasmBackend;
+use marine_wasm_backend_traits::WasmBackend;
 
 use serde::Serialize;
 use serde::Deserialize;
@@ -31,7 +32,6 @@ use wasm_bindgen::prelude::*;
 
 use std::collections::HashMap;
 use std::collections::HashSet;
-use std::ops::DerefMut;
 use std::path::PathBuf;
 
 #[derive(Serialize, Deserialize)]
@@ -161,7 +161,9 @@ pub async fn register_module(
 
     marine_logger().enable_service_logging(log_fn, module_names);
 
-    let new_marine = Marine::<JsWasmBackend>::with_modules(modules, marine_config).await?;
+    let backend = JsWasmBackend::new()?;
+
+    let new_marine = Marine::<JsWasmBackend>::with_modules(backend, modules, marine_config).await?;
 
     marine.replace(new_marine);