Implement wasm_config_new and wasm_engine_new_with_config (#901)

* Implement wasm_config_new and wasm_engine_new_with_config

crates/c-api/src/ext.rs

@@ -0,0 +1,88 @@
+//! This file defines the extern "C" API extension, which are specific
+//! to the wasmtime implementation.
+
+use crate::wasm_config_t;
+use wasmtime::{OptLevel, Strategy};
+
+#[repr(u8)]
+#[derive(Clone)]
+pub enum wasmtime_strategy_t {
+    WASMTIME_STRATEGY_AUTO,
+    WASMTIME_STRATEGY_CRANELIFT,
+    WASMTIME_STRATEGY_LIGHTBEAM,
+}
+
+#[repr(u8)]
+#[derive(Clone)]
+pub enum wasmtime_opt_level_t {
+    WASMTIME_OPT_LEVEL_NONE,
+    WASMTIME_OPT_LEVEL_SPEED,
+    WASMTIME_OPT_LEVEL_SPEED_AND_SIZE,
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_debug_info_set(c: *mut wasm_config_t, enable: bool) {
+    (*c).config.debug_info(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_wasm_threads_set(c: *mut wasm_config_t, enable: bool) {
+    (*c).config.wasm_threads(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_wasm_reference_types_set(
+    c: *mut wasm_config_t,
+    enable: bool,
+) {
+    (*c).config.wasm_reference_types(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_wasm_simd_set(c: *mut wasm_config_t, enable: bool) {
+    (*c).config.wasm_simd(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_wasm_bulk_memory_set(c: *mut wasm_config_t, enable: bool) {
+    (*c).config.wasm_bulk_memory(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_wasm_multi_value_set(c: *mut wasm_config_t, enable: bool) {
+    (*c).config.wasm_multi_value(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_strategy_set(
+    c: *mut wasm_config_t,
+    strategy: wasmtime_strategy_t,
+) {
+    use wasmtime_strategy_t::*;
+    drop((*c).config.strategy(match strategy {
+        WASMTIME_STRATEGY_AUTO => Strategy::Auto,
+        WASMTIME_STRATEGY_CRANELIFT => Strategy::Cranelift,
+        WASMTIME_STRATEGY_LIGHTBEAM => Strategy::Lightbeam,
+    }));
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_cranelift_debug_verifier_set(
+    c: *mut wasm_config_t,
+    enable: bool,
+) {
+    (*c).config.cranelift_debug_verifier(enable);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn wasmtime_config_cranelift_opt_level_set(
+    c: *mut wasm_config_t,
+    opt_level: wasmtime_opt_level_t,
+) {
+    use wasmtime_opt_level_t::*;
+    (*c).config.cranelift_opt_level(match opt_level {
+        WASMTIME_OPT_LEVEL_NONE => OptLevel::None,
+        WASMTIME_OPT_LEVEL_SPEED => OptLevel::Speed,
+        WASMTIME_OPT_LEVEL_SPEED_AND_SIZE => OptLevel::SpeedAndSize,
+    });
+}

crates/c-api/src/lib.rs

@@ -10,9 +10,9 @@ use std::panic::{self, AssertUnwindSafe};
 use std::rc::Rc;
 use std::{mem, ptr, slice};
 use wasmtime::{
-    AnyRef, Callable, Engine, ExportType, Extern, ExternType, Func, FuncType, Global, GlobalType,
-    HostInfo, HostRef, ImportType, Instance, Limits, Memory, MemoryType, Module, Store, Table,
-    TableType, Trap, Val, ValType,
+    AnyRef, Callable, Config, Engine, ExportType, Extern, ExternType, Func, FuncType, Global,
+    GlobalType, HostInfo, HostRef, ImportType, Instance, Limits, Memory, MemoryType, Module, Store,
+    Table, TableType, Trap, Val, ValType,
 };
 
 macro_rules! declare_vec {
@@ -159,7 +159,7 @@ pub type wasm_name_t = wasm_byte_vec_t;
 #[repr(C)]
 #[derive(Clone)]
 pub struct wasm_config_t {
-    _unused: [u8; 0],
+    pub(crate) config: Config,
 }
 #[repr(C)]
 #[derive(Clone)]
@@ -451,6 +451,14 @@ pub unsafe extern "C" fn wasm_engine_delete(engine: *mut wasm_engine_t) {
     let _ = Box::from_raw(engine);
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn wasm_config_new() -> *mut wasm_config_t {
+    let config = Box::new(wasm_config_t {
+        config: Config::default(),
+    });
+    Box::into_raw(config)
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn wasm_engine_new() -> *mut wasm_engine_t {
     let engine = Box::new(wasm_engine_t {
@@ -459,6 +467,15 @@ pub unsafe extern "C" fn wasm_engine_new() -> *mut wasm_engine_t {
     Box::into_raw(engine)
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn wasm_engine_new_with_config(c: *mut wasm_config_t) -> *mut wasm_engine_t {
+    let config = Box::from_raw(c).config;
+    let engine = Box::new(wasm_engine_t {
+        engine: HostRef::new(Engine::new(&config)),
+    });
+    Box::into_raw(engine)
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn wasm_extern_as_func(e: *mut wasm_extern_t) -> *mut wasm_func_t {
     match &(*e).which {
@@ -1745,3 +1762,7 @@ pub unsafe extern "C" fn wasm_valtype_vec_copy(
     let slice = slice::from_raw_parts((*src).data, (*src).size);
     (*out).set_from_slice(slice);
 }
+
+mod ext;
+
+pub use crate::ext::*;