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:
@@ -190,7 +190,7 @@ impl RunCommand {
|
||||
store: &Store,
|
||||
module_registry: &ModuleRegistry,
|
||||
path: &Path,
|
||||
) -> Result<(Instance, Module)> {
|
||||
) -> Result<Instance> {
|
||||
// Read the wasm module binary either as `*.wat` or a raw binary
|
||||
let data = wat::parse_file(path)?;
|
||||
|
||||
@@ -199,7 +199,6 @@ impl RunCommand {
|
||||
// Resolve import using module_registry.
|
||||
let imports = module
|
||||
.imports()
|
||||
.iter()
|
||||
.map(|i| {
|
||||
let export = match i.module() {
|
||||
"wasi_snapshot_preview1" => {
|
||||
@@ -222,20 +221,16 @@ impl RunCommand {
|
||||
let instance = Instance::new(&module, &imports)
|
||||
.context(format!("failed to instantiate {:?}", path))?;
|
||||
|
||||
Ok((instance, module))
|
||||
Ok(instance)
|
||||
}
|
||||
|
||||
fn handle_module(&self, store: &Store, module_registry: &ModuleRegistry) -> Result<()> {
|
||||
let (instance, module) = Self::instantiate_module(store, module_registry, &self.module)?;
|
||||
let instance = Self::instantiate_module(store, module_registry, &self.module)?;
|
||||
|
||||
// If a function to invoke was given, invoke it.
|
||||
if let Some(name) = self.invoke.as_ref() {
|
||||
self.invoke_export(instance, name)?;
|
||||
} else if module
|
||||
.exports()
|
||||
.iter()
|
||||
.any(|export| export.name().is_empty())
|
||||
{
|
||||
} else if instance.exports().any(|export| export.name().is_empty()) {
|
||||
// Launch the default command export.
|
||||
self.invoke_export(instance, "")?;
|
||||
} else {
|
||||
@@ -248,19 +243,16 @@ impl RunCommand {
|
||||
}
|
||||
|
||||
fn invoke_export(&self, instance: Instance, name: &str) -> Result<()> {
|
||||
let pos = instance
|
||||
.module()
|
||||
.exports()
|
||||
.iter()
|
||||
.enumerate()
|
||||
.find(|(_, e)| e.name() == name);
|
||||
let (ty, export) = match pos {
|
||||
Some((i, ty)) => match (ty.ty(), &instance.exports()[i]) {
|
||||
(wasmtime::ExternType::Func(ty), wasmtime::Extern::Func(f)) => (ty, f),
|
||||
_ => bail!("export of `{}` wasn't a function", name),
|
||||
},
|
||||
None => bail!("failed to find export of `{}` in module", name),
|
||||
let func = if let Some(export) = instance.get_export(name) {
|
||||
if let Some(func) = export.into_func() {
|
||||
func
|
||||
} else {
|
||||
bail!("export of `{}` wasn't a function", name)
|
||||
}
|
||||
} else {
|
||||
bail!("failed to find export of `{}` in module", name)
|
||||
};
|
||||
let ty = func.ty();
|
||||
if ty.params().len() > 0 {
|
||||
eprintln!(
|
||||
"warning: using `--invoke` with a function that takes arguments \
|
||||
@@ -288,7 +280,7 @@ impl RunCommand {
|
||||
|
||||
// Invoke the function and then afterwards print all the results that came
|
||||
// out, if there are any.
|
||||
let results = export
|
||||
let results = func
|
||||
.call(&values)
|
||||
.with_context(|| format!("failed to invoke `{}`", name))?;
|
||||
if !results.is_empty() {
|
||||
|
||||
Reference in New Issue
Block a user