Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use enum to differentiate between normal and precompiled plugins

Browse source
This commit is contained in:
Isaac Clayton 2022-07-13 14:26:52 +02:00
parent daf1674ca6
commit a6edf85078
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/plugin_runtime/src/lib.rs
View file

@ -46,10 +46,9 @@ mod tests {
.map(|output| output.stdout)
})
.unwrap()
.init(
false,
include_bytes!("../../../plugins/bin/test_plugin.wasm"),
)
.init(PluginBinary::Wasm(
include_bytes!("../../../plugins/bin/test_plugin.wasm").as_ref(),
))
.await
.unwrap();

18
crates/plugin_runtime/src/plugin.rs
View file

@ -345,8 +345,8 @@ impl PluginBuilder {
/// Initializes a [`Plugin`] from a given compiled Wasm module.
/// Both binary (`.wasm`) and text (`.wat`) module formats are supported.
pub async fn init<T: AsRef<[u8]>>(self, precompiled: bool, module: T) -> Result<Plugin, Error> {
Plugin::init(precompiled, module.as_ref(), self).await
pub async fn init<'a>(self, binary: PluginBinary<'a>) -> Result<Plugin, Error> {
Plugin::init(binary, self).await
}
}
@ -379,6 +379,11 @@ impl WasiCtxAlloc {
}
}
pub enum PluginBinary<'a> {
Wasm(&'a [u8]),
Precompiled(&'a [u8]),
}
/// Represents a WebAssembly plugin, with access to the WebAssembly System Inferface.
/// Build a new plugin using [`PluginBuilder`].
pub struct Plugin {
@ -406,7 +411,7 @@ impl Plugin {
println!();
}
async fn init(precompiled: bool, module: &[u8], plugin: PluginBuilder) -> Result<Self, Error> {
async fn init<'a>(binary: PluginBinary<'a>, plugin: PluginBuilder) -> Result<Self, Error> {
// initialize the WebAssembly System Interface context
let engine = plugin.engine;
let mut linker = plugin.linker;
@ -422,10 +427,9 @@ impl Plugin {
},
);
let module = if precompiled {
unsafe { Module::deserialize(&engine, module)? }
} else {
Module::new(&engine, module)?
let module = match binary {
PluginBinary::Precompiled(bytes) => unsafe { Module::deserialize(&engine, bytes)? },
PluginBinary::Wasm(bytes) => Module::new(&engine, bytes)?,
};
// set up automatic yielding based on configuration