Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wasmtime: tidy up #675

Merged
merged 8 commits into from
Sep 30, 2024
Merged

wasmtime: tidy up #675

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e061f3
wasmtime: tidy up imports
Mossaka Sep 20, 2024
73d9600
wasmtime: simplify trait bound for WasmtimeEngine
Mossaka Sep 20, 2024
6a3df73
wasmtime: rename func to wasm_func_name
Mossaka Sep 20, 2024
9d0b724
wasmtime: tidy up the linker name
Mossaka Sep 20, 2024
35811bb
wasmtime: de-duplicate builder in prepare_wasi_ctx()
Mossaka Sep 20, 2024
5185988
wasmtime: extract linker instantiation out from the if statement
Mossaka Sep 20, 2024
d80c34d
containerd-shim-wasmtime: revert the changes to prepare_wasi_ctx()
Mossaka Sep 29, 2024
00cfb44
containerd-shim-wasmtime: revert wasm_func_name to func
Mossaka Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions crates/containerd-shim-wasmtime/src/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use containerd_shim_wasm::container::{
Engine, Entrypoint, Instance, RuntimeContext, Stdio, WasmBinaryType,
};
use containerd_shim_wasm::sandbox::WasmLayer;
use wasmtime::component::{self as wasmtime_component, Component, ResourceTable};
use wasmtime::component::{self, Component, ResourceTable};
use wasmtime::{Config, Module, Precompiled, Store};
use wasmtime_wasi::preview1::{self as wasi_preview1};
use wasmtime_wasi::{self as wasi_preview2};
Expand Down Expand Up @@ -133,7 +133,10 @@ impl<T: WasiConfig> Engine for WasmtimeEngine<T> {
}
}

impl<T: std::clone::Clone + Sync + WasiConfig + Send + 'static> WasmtimeEngine<T> {
impl<T> WasmtimeEngine<T>
where
T: std::clone::Clone + Sync + WasiConfig + Send + 'static,
{
/// Execute a wasm module.
///
/// This function adds wasi_preview1 to the linker and can be utilized
Expand All @@ -150,8 +153,8 @@ impl<T: std::clone::Clone + Sync + WasiConfig + Send + 'static> WasmtimeEngine<T
let mut module_linker = wasmtime::Linker::new(&self.engine);

log::debug!("init linker");
wasi_preview1::add_to_linker_async(&mut module_linker, |s: &mut WasiCtx| {
&mut s.wasi_preview1
wasi_preview1::add_to_linker_async(&mut module_linker, |wasi_ctx: &mut WasiCtx| {
&mut wasi_ctx.wasi_preview1
})?;

wasmtime_wasi::runtime::in_tokio(async move {
Expand Down Expand Up @@ -186,20 +189,19 @@ impl<T: std::clone::Clone + Sync + WasiConfig + Send + 'static> WasmtimeEngine<T
) -> Result<std::prelude::v1::Result<(), anyhow::Error>, anyhow::Error> {
log::debug!("loading wasm component");

let mut linker = wasmtime_component::Linker::new(&self.engine);
let mut linker = component::Linker::new(&self.engine);

log::debug!("init linker");
wasi_preview2::add_to_linker_async(&mut linker)?;
log::debug!("done init linker");

log::info!("instantiating component");

// This is a adapter logic that converts wasip1 `_start` function to wasip2 `run` function.
//
// TODO: think about a better way to do this.
wasmtime_wasi::runtime::in_tokio(async move {
let pre = linker.instantiate_pre(&component)?;
if func == "_start" {
let pre = linker.instantiate_pre(&component)?;
let (command, _instance) =
wasi_preview2::bindings::Command::instantiate_pre(&mut store, &pre).await?;

Expand All @@ -217,8 +219,6 @@ impl<T: std::clone::Clone + Sync + WasiConfig + Send + 'static> WasmtimeEngine<T

Ok(status)
} else {
let pre = linker.instantiate_pre(&component)?;

let instance = pre.instantiate_async(&mut store).await?;

log::info!("getting component exported function {func:?}");
Expand Down Expand Up @@ -277,14 +277,9 @@ fn prepare_wasi_ctx(
ctx: &impl RuntimeContext,
envs: &[(String, String)],
) -> Result<WasiCtx, anyhow::Error> {
let mut wasi_preview1_builder = wasi_builder(ctx, envs)?;
let wasi_preview1_ctx = wasi_preview1_builder.build_p1();

let mut wasi_preview2_builder = wasi_builder(ctx, envs)?;
let wasi_preview2_ctx = wasi_preview2_builder.build();
let wasi_data = WasiCtx {
wasi_preview1: wasi_preview1_ctx,
wasi_preview2: wasi_preview2_ctx,
wasi_preview1: wasi_builder(ctx, envs)?.build_p1(),
wasi_preview2: wasi_builder(ctx, envs)?.build(),
resource_table: ResourceTable::default(),
};
Ok(wasi_data)
Expand Down
Loading