9364eb1d98
* Compute instance exports on demand. Instead having instances eagerly compute a Vec of Externs, and bumping the refcount for each Extern, compute Externs on demand. This also enables `Instance::get_export` to avoid doing a linear search. This also means that the closure returned by `get0` and friends now holds an `InstanceHandle` to dynamically hold the instance live rather than being scoped to a lifetime. * Compute module imports and exports on demand too. And compute Extern::ty on demand too. * Add a utility function for computing an ExternType. * Add a utility function for looking up a function's signature. * Add a utility function for computing the ValType of a Global. * Rename wasmtime_environ::Export to EntityIndex. This helps differentiate it from other Export types in the tree, and describes what it is. * Fix a typo in a comment. * Simplify module imports and exports. * Make `Instance::exports` return the export names. This significantly simplifies the public API, as it's relatively common to need the names, and this avoids the need to do a zip with `Module::exports`. This also changes `ImportType` and `ExportType` to have public members instead of private members and accessors, as I find that simplifies the usage particularly in cases where there are temporary instances. * Remove `Instance::module`. This doesn't quite remove `Instance`'s `module` member, it gets a step closer. * Use a InstanceHandle utility function. * Don't consume self in the `Func::get*` methods. Instead, just create a closure containing the instance handle and the export for them to call. * Use `ExactSizeIterator` to avoid needing separate `num_*` methods. * Rename `Extern::func()` etc. to `into_func()` etc. * Revise examples to avoid using `nth`. * Add convenience methods to instance for getting specific extern types. * Use the convenience functions in more tests and examples. * Avoid cloning strings for `ImportType` and `ExportType`. * Remove more obviated clone() calls. * Simplify `Func`'s closure state. * Make wasmtime::Export's fields private. This makes them more consistent with ExportType. * Fix compilation error. * Make a lifetime parameter explicit, and use better lifetime names. Instead of 'me, use 'instance and 'module to make it clear what the lifetime is. * More lifetime cleanups.
91 lines
2.6 KiB
Rust
91 lines
2.6 KiB
Rust
use crate::wasm_externkind_t;
|
|
use crate::{wasm_externtype_t, wasm_func_t, wasm_global_t, wasm_memory_t, wasm_table_t};
|
|
use wasmtime::{ExternType, Func, Global, HostRef, Memory, Table};
|
|
|
|
#[derive(Clone)]
|
|
pub struct wasm_extern_t {
|
|
pub(crate) which: ExternHost,
|
|
}
|
|
|
|
wasmtime_c_api_macros::declare_ref!(wasm_extern_t);
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) enum ExternHost {
|
|
Func(HostRef<Func>),
|
|
Global(HostRef<Global>),
|
|
Memory(HostRef<Memory>),
|
|
Table(HostRef<Table>),
|
|
}
|
|
|
|
impl wasm_extern_t {
|
|
fn anyref(&self) -> wasmtime::AnyRef {
|
|
match &self.which {
|
|
ExternHost::Func(f) => f.anyref(),
|
|
ExternHost::Global(f) => f.anyref(),
|
|
ExternHost::Memory(f) => f.anyref(),
|
|
ExternHost::Table(f) => f.anyref(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_kind(e: &wasm_extern_t) -> wasm_externkind_t {
|
|
match e.which {
|
|
ExternHost::Func(_) => crate::WASM_EXTERN_FUNC,
|
|
ExternHost::Global(_) => crate::WASM_EXTERN_GLOBAL,
|
|
ExternHost::Table(_) => crate::WASM_EXTERN_TABLE,
|
|
ExternHost::Memory(_) => crate::WASM_EXTERN_MEMORY,
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_type(e: &wasm_extern_t) -> Box<wasm_externtype_t> {
|
|
let ty = match &e.which {
|
|
ExternHost::Func(f) => ExternType::Func(f.borrow().ty()),
|
|
ExternHost::Global(f) => ExternType::Global(f.borrow().ty()),
|
|
ExternHost::Table(f) => ExternType::Table(f.borrow().ty()),
|
|
ExternHost::Memory(f) => ExternType::Memory(f.borrow().ty()),
|
|
};
|
|
Box::new(wasm_externtype_t::new(ty))
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_func(e: &wasm_extern_t) -> Option<&wasm_func_t> {
|
|
wasm_func_t::try_from(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_func_const(e: &wasm_extern_t) -> Option<&wasm_func_t> {
|
|
wasm_extern_as_func(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_global(e: &wasm_extern_t) -> Option<&wasm_global_t> {
|
|
wasm_global_t::try_from(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_global_const(e: &wasm_extern_t) -> Option<&wasm_global_t> {
|
|
wasm_extern_as_global(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_table(e: &wasm_extern_t) -> Option<&wasm_table_t> {
|
|
wasm_table_t::try_from(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_table_const(e: &wasm_extern_t) -> Option<&wasm_table_t> {
|
|
wasm_extern_as_table(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_memory(e: &wasm_extern_t) -> Option<&wasm_memory_t> {
|
|
wasm_memory_t::try_from(e)
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_extern_as_memory_const(e: &wasm_extern_t) -> Option<&wasm_memory_t> {
|
|
wasm_extern_as_memory(e)
|
|
}
|