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:
@@ -22,8 +22,7 @@ fn main() -> Result<()> {
|
||||
|
||||
// Invoke `fib` export
|
||||
let fib = instance
|
||||
.get_export("fib")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("fib")
|
||||
.ok_or(anyhow::format_err!("failed to find `fib` function export"))?
|
||||
.get1::<i32, i32>()?;
|
||||
println!("fib(6) = {}", fib(6)?);
|
||||
|
||||
@@ -16,8 +16,7 @@ fn main() -> Result<()> {
|
||||
|
||||
// Invoke `gcd` export
|
||||
let gcd = instance
|
||||
.get_export("gcd")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("gcd")
|
||||
.ok_or(anyhow::format_err!("failed to find `gcd` function export"))?
|
||||
.get2::<i32, i32, i32>()?;
|
||||
|
||||
|
||||
@@ -35,8 +35,7 @@ fn main() -> Result<()> {
|
||||
// Next we poke around a bit to extract the `run` function from the module.
|
||||
println!("Extracting export...");
|
||||
let run = instance
|
||||
.get_export("run")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("run")
|
||||
.ok_or(anyhow::format_err!("failed to find `run` function export"))?
|
||||
.get0::<()>()?;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ fn main() -> Result<()> {
|
||||
|
||||
// And with that we can perform the final link and the execute the module.
|
||||
let linking1 = linker.instantiate(&linking1)?;
|
||||
let run = linking1.get_export("run").and_then(|e| e.func()).unwrap();
|
||||
let run = linking1.get_func("run").unwrap();
|
||||
let run = run.get0::<()>()?;
|
||||
run()?;
|
||||
Ok(())
|
||||
|
||||
@@ -18,22 +18,18 @@ fn main() -> Result<()> {
|
||||
|
||||
// Load up our exports from the instance
|
||||
let memory = instance
|
||||
.get_export("memory")
|
||||
.and_then(|e| e.memory())
|
||||
.get_memory("memory")
|
||||
.ok_or(anyhow::format_err!("failed to find `memory` export"))?;
|
||||
let size = instance
|
||||
.get_export("size")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("size")
|
||||
.ok_or(anyhow::format_err!("failed to find `size` export"))?
|
||||
.get0::<i32>()?;
|
||||
let load = instance
|
||||
.get_export("load")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("load")
|
||||
.ok_or(anyhow::format_err!("failed to find `load` export"))?
|
||||
.get1::<i32, i32>()?;
|
||||
let store = instance
|
||||
.get_export("store")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("store")
|
||||
.ok_or(anyhow::format_err!("failed to find `store` export"))?
|
||||
.get2::<i32, i32, ()>()?;
|
||||
|
||||
|
||||
@@ -43,8 +43,7 @@ fn main() -> Result<()> {
|
||||
// Extract exports.
|
||||
println!("Extracting export...");
|
||||
let g = instance
|
||||
.get_export("g")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("g")
|
||||
.ok_or(format_err!("failed to find export `g`"))?;
|
||||
|
||||
// Call `$g`.
|
||||
@@ -60,8 +59,7 @@ fn main() -> Result<()> {
|
||||
// Call `$round_trip_many`.
|
||||
println!("Calling export \"round_trip_many\"...");
|
||||
let round_trip_many = instance
|
||||
.get_export("round_trip_many")
|
||||
.and_then(|e| e.func())
|
||||
.get_func("round_trip_many")
|
||||
.ok_or(format_err!("failed to find export `round_trip_many`"))?;
|
||||
let args = vec![
|
||||
Val::I64(0),
|
||||
|
||||
@@ -33,10 +33,7 @@ fn main() -> Result<()> {
|
||||
// Instance our module with the imports we've created, then we can run the
|
||||
// standard wasi `_start` function.
|
||||
let instance = Instance::new(&module, &imports)?;
|
||||
let start = instance
|
||||
.get_export("_start")
|
||||
.and_then(|e| e.func())
|
||||
.unwrap();
|
||||
let start = instance.get_func("_start").unwrap();
|
||||
let start = start.get0::<()>()?;
|
||||
start()?;
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user