Refactor (#1524)
* 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.
This commit is contained in:
@@ -169,31 +169,14 @@ pub fn differential_execution(
|
||||
}
|
||||
};
|
||||
|
||||
let funcs = module
|
||||
.exports()
|
||||
.iter()
|
||||
.filter_map(|e| {
|
||||
if let ExternType::Func(_) = e.ty() {
|
||||
Some(e.name())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
for name in funcs {
|
||||
for (name, f) in instance.exports().filter_map(|e| {
|
||||
let name = e.name();
|
||||
e.into_func().map(|f| (name, f))
|
||||
}) {
|
||||
// Always call the hang limit initializer first, so that we don't
|
||||
// infinite loop when calling another export.
|
||||
init_hang_limit(&instance);
|
||||
|
||||
let f = match instance
|
||||
.get_export(&name)
|
||||
.expect("instance should have export from module")
|
||||
{
|
||||
Extern::Func(f) => f.clone(),
|
||||
_ => panic!("export should be a function"),
|
||||
};
|
||||
|
||||
let ty = f.ty();
|
||||
let params = match dummy::dummy_values(ty.params()) {
|
||||
Ok(p) => p,
|
||||
@@ -378,8 +361,7 @@ pub fn make_api_calls(api: crate::generators::api::ApiCalls) {
|
||||
|
||||
let funcs = instance
|
||||
.exports()
|
||||
.iter()
|
||||
.filter_map(|e| match e {
|
||||
.filter_map(|e| match e.into_extern() {
|
||||
Extern::Func(f) => Some(f.clone()),
|
||||
_ => None,
|
||||
})
|
||||
|
||||
@@ -6,19 +6,20 @@ use wasmtime::{
|
||||
};
|
||||
|
||||
/// Create a set of dummy functions/globals/etc for the given imports.
|
||||
pub fn dummy_imports(store: &Store, import_tys: &[ImportType]) -> Result<Vec<Extern>, Trap> {
|
||||
let mut imports = Vec::with_capacity(import_tys.len());
|
||||
for imp in import_tys {
|
||||
imports.push(match imp.ty() {
|
||||
ExternType::Func(func_ty) => Extern::Func(dummy_func(&store, func_ty.clone())),
|
||||
ExternType::Global(global_ty) => {
|
||||
Extern::Global(dummy_global(&store, global_ty.clone())?)
|
||||
}
|
||||
ExternType::Table(table_ty) => Extern::Table(dummy_table(&store, table_ty.clone())?),
|
||||
ExternType::Memory(mem_ty) => Extern::Memory(dummy_memory(&store, mem_ty.clone())),
|
||||
});
|
||||
}
|
||||
Ok(imports)
|
||||
pub fn dummy_imports<'module>(
|
||||
store: &Store,
|
||||
import_tys: impl Iterator<Item = ImportType<'module>>,
|
||||
) -> Result<Vec<Extern>, Trap> {
|
||||
import_tys
|
||||
.map(|imp| {
|
||||
Ok(match imp.ty() {
|
||||
ExternType::Func(func_ty) => Extern::Func(dummy_func(&store, func_ty)),
|
||||
ExternType::Global(global_ty) => Extern::Global(dummy_global(&store, global_ty)?),
|
||||
ExternType::Table(table_ty) => Extern::Table(dummy_table(&store, table_ty)?),
|
||||
ExternType::Memory(mem_ty) => Extern::Memory(dummy_memory(&store, mem_ty)),
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Construct a dummy function for the given function type
|
||||
|
||||
Reference in New Issue
Block a user