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: Handle common cli args in wasmtime serve #7134

Merged
merged 4 commits into from
Oct 4, 2023
Merged

wasmtime: Handle common cli args in wasmtime serve #7134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdc711f
Refactor option handling in the `run` and `serve` commands
elliottt Sep 29, 2023
6f7cbcc
Use a real thread to manage epoch increments
elliottt Oct 4, 2023
b81d774
Move module/component loading into src/common.rs
elliottt Oct 4, 2023
02da479
Require wasi-http and component-model to not be disabled in serve
elliottt Oct 4, 2023
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
138 changes: 30 additions & 108 deletions src/commands/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@
allow(irrefutable_let_patterns, unreachable_patterns)
)]

use crate::common::{Profile, RunCommon};

use anyhow::{anyhow, bail, Context as _, Error, Result};
use clap::Parser;
use std::fs::File;
use std::io::Write;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::thread;
use std::time::Duration;
use wasmtime::{
AsContextMut, Engine, Func, GuestProfiler, Module, Precompiled, Store, StoreLimits,
StoreLimitsBuilder, UpdateDeadline, Val, ValType,
UpdateDeadline, Val, ValType,
};
use wasmtime_cli_flags::opt::WasmtimeOptionValue;
use wasmtime_cli_flags::CommonOptions;
use wasmtime_wasi::maybe_exit_on_error;
use wasmtime_wasi::preview2;
use wasmtime_wasi::sync::{ambient_authority, Dir, TcpListener, WasiCtxBuilder};
Expand Down Expand Up @@ -61,43 +60,12 @@ fn parse_preloads(s: &str) -> Result<(String, PathBuf)> {
Ok((parts[0].into(), parts[1].into()))
}

fn parse_profile(s: &str) -> Result<Profile> {
let parts = s.split(',').collect::<Vec<_>>();
match &parts[..] {
["perfmap"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::PerfMap)),
["jitdump"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::JitDump)),
["vtune"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::VTune)),
["guest"] => Ok(Profile::Guest {
path: "wasmtime-guest-profile.json".to_string(),
interval: Duration::from_millis(10),
}),
["guest", path] => Ok(Profile::Guest {
path: path.to_string(),
interval: Duration::from_millis(10),
}),
["guest", path, dur] => Ok(Profile::Guest {
path: path.to_string(),
interval: WasmtimeOptionValue::parse(Some(dur))?,
}),
_ => bail!("unknown profiling strategy: {s}"),
}
}

/// Runs a WebAssembly module
#[derive(Parser)]
#[structopt(name = "run")]
pub struct RunCommand {
#[clap(flatten)]
common: CommonOptions,

/// Allow executing precompiled WebAssembly modules as `*.cwasm` files.
///
/// Note that this option is not safe to pass if the module being passed in
/// is arbitrary user input. Only `wasmtime`-precompiled modules generated
/// via the `wasmtime compile` command or equivalent should be passed as an
/// argument with this option specified.
#[clap(long = "allow-precompiled")]
allow_precompiled: bool,
run: RunCommon,

/// Grant access of a host directory to a guest.
///
Expand Down Expand Up @@ -131,28 +99,6 @@ pub struct RunCommand {
)]
preloads: Vec<(String, PathBuf)>,

/// Profiling strategy (valid options are: perfmap, jitdump, vtune, guest)
///
/// The perfmap, jitdump, and vtune profiling strategies integrate Wasmtime
/// with external profilers such as `perf`. The guest profiling strategy
/// enables in-process sampling and will write the captured profile to
/// `wasmtime-guest-profile.json` by default which can be viewed at
/// https://profiler.firefox.com/.
///
/// The `guest` option can be additionally configured as:
///
/// --profile=guest[,path[,interval]]
///
/// where `path` is where to write the profile and `interval` is the
/// duration between samples. When used with `--wasm-timeout` the timeout
/// will be rounded up to the nearest multiple of this interval.
#[clap(
long,
value_name = "STRATEGY",
value_parser = parse_profile,
)]
profile: Option<Profile>,

/// The WebAssembly module to run and arguments to pass to it.
///
/// Arguments passed to the wasm module will be configured as WASI CLI
Expand All @@ -162,12 +108,6 @@ pub struct RunCommand {
module_and_args: Vec<PathBuf>,
}

#[derive(Clone)]
enum Profile {
Native(wasmtime::ProfilingStrategy),
Guest { path: String, interval: Duration },
}

enum CliLinker {
Core(wasmtime::Linker<Host>),
#[cfg(feature = "component-model")]
Expand Down Expand Up @@ -201,14 +141,14 @@ impl CliModule {
impl RunCommand {
/// Executes the command.
pub fn execute(mut self) -> Result<()> {
self.common.init_logging();
self.run.common.init_logging();

let mut config = self.common.config(None)?;
let mut config = self.run.common.config(None)?;

if self.common.wasm.timeout.is_some() {
if self.run.common.wasm.timeout.is_some() {
config.epoch_interruption(true);
}
match self.profile {
match self.run.profile {
Some(Profile::Native(s)) => {
config.profiler(s);
}
Expand All @@ -225,7 +165,7 @@ impl RunCommand {
let main = self.load_module(&engine, &self.module_and_args[0])?;

// Validate coredump-on-trap argument
if let Some(path) = &self.common.debug.coredump {
if let Some(path) = &self.run.common.debug.coredump {
if path.contains("%") {
bail!("the coredump-on-trap path does not support patterns yet.")
}
Expand All @@ -238,7 +178,7 @@ impl RunCommand {
CliLinker::Component(wasmtime::component::Linker::new(&engine))
}
};
if let Some(enable) = self.common.wasm.unknown_exports_allow {
if let Some(enable) = self.run.common.wasm.unknown_exports_allow {
match &mut linker {
CliLinker::Core(l) => {
l.allow_unknown_exports(enable);
Expand All @@ -254,31 +194,12 @@ impl RunCommand {
let mut store = Store::new(&engine, host);
self.populate_with_wasi(&mut linker, &mut store, &main)?;

let mut limits = StoreLimitsBuilder::new();
if let Some(max) = self.common.wasm.max_memory_size {
limits = limits.memory_size(max);
}
if let Some(max) = self.common.wasm.max_table_elements {
limits = limits.table_elements(max);
}
if let Some(max) = self.common.wasm.max_instances {
limits = limits.instances(max);
}
if let Some(max) = self.common.wasm.max_tables {
limits = limits.tables(max);
}
if let Some(max) = self.common.wasm.max_memories {
limits = limits.memories(max);
}
if let Some(enable) = self.common.wasm.trap_on_grow_failure {
limits = limits.trap_on_grow_failure(enable);
}
store.data_mut().limits = limits.build();
store.data_mut().limits = self.run.store_limits();
store.limiter(|t| &mut t.limits);

// If fuel has been configured, we want to add the configured
// fuel amount to this store.
if let Some(fuel) = self.common.wasm.fuel {
if let Some(fuel) = self.run.common.wasm.fuel {
store.add_fuel(fuel)?;
}

Expand Down Expand Up @@ -350,7 +271,7 @@ impl RunCommand {
fn compute_preopen_sockets(&self) -> Result<Vec<TcpListener>> {
let mut listeners = vec![];

for address in &self.common.wasi.tcplisten {
for address in &self.run.common.wasi.tcplisten {
let stdlistener = std::net::TcpListener::bind(address)
.with_context(|| format!("failed to bind to address '{}'", address))?;

Expand Down Expand Up @@ -387,7 +308,7 @@ impl RunCommand {
store: &mut Store<Host>,
modules: Vec<(String, Module)>,
) -> Box<dyn FnOnce(&mut Store<Host>)> {
if let Some(Profile::Guest { path, interval }) = &self.profile {
if let Some(Profile::Guest { path, interval }) = &self.run.profile {
let module_name = self.module_and_args[0].to_str().unwrap_or("<main module>");
let interval = *interval;
store.data_mut().guest_profiler =
Expand All @@ -406,7 +327,7 @@ impl RunCommand {
store.as_context_mut().data_mut().guest_profiler = Some(profiler);
}

if let Some(timeout) = self.common.wasm.timeout {
if let Some(timeout) = self.run.common.wasm.timeout {
let mut timeout = (timeout.as_secs_f64() / interval.as_secs_f64()).ceil() as u64;
assert!(timeout > 0);
store.epoch_deadline_callback(move |mut store| {
Expand Down Expand Up @@ -448,7 +369,7 @@ impl RunCommand {
});
}

if let Some(timeout) = self.common.wasm.timeout {
if let Some(timeout) = self.run.common.wasm.timeout {
store.set_epoch_deadline(1);
let engine = store.engine().clone();
thread::spawn(move || {
Expand All @@ -469,7 +390,7 @@ impl RunCommand {
) -> Result<()> {
// The main module might be allowed to have unknown imports, which
// should be defined as traps:
if self.common.wasm.unknown_imports_trap == Some(true) {
if self.run.common.wasm.unknown_imports_trap == Some(true) {
match linker {
CliLinker::Core(linker) => {
linker.define_unknown_imports_as_traps(module.unwrap_core())?;
Expand All @@ -479,7 +400,7 @@ impl RunCommand {
}

// ...or as default values.
if self.common.wasm.unknown_imports_default == Some(true) {
if self.run.common.wasm.unknown_imports_default == Some(true) {
match linker {
CliLinker::Core(linker) => {
linker.define_unknown_imports_as_default_values(module.unwrap_core())?;
Expand Down Expand Up @@ -620,7 +541,7 @@ impl RunCommand {
}

fn handle_core_dump(&self, store: &mut Store<Host>, err: Error) -> Error {
let coredump_path = match &self.common.debug.coredump {
let coredump_path = match &self.run.common.debug.coredump {
Some(path) => path,
None => return err,
};
Expand Down Expand Up @@ -736,7 +657,7 @@ impl RunCommand {
}

fn ensure_allow_precompiled(&self) -> Result<()> {
if self.allow_precompiled {
if self.run.allow_precompiled {
Ok(())
} else {
bail!("running a precompiled module requires the `--allow-precompiled` flag")
Expand All @@ -745,7 +666,7 @@ impl RunCommand {

#[cfg(feature = "component-model")]
fn ensure_allow_components(&self) -> Result<()> {
if self.common.wasm.component_model != Some(true) {
if self.run.common.wasm.component_model != Some(true) {
bail!("cannot execute a component without `--wasm component-model`");
}

Expand All @@ -759,10 +680,10 @@ impl RunCommand {
store: &mut Store<Host>,
module: &CliModule,
) -> Result<()> {
if self.common.wasi.common != Some(false) {
if self.run.common.wasi.common != Some(false) {
match linker {
CliLinker::Core(linker) => {
if self.common.wasi.preview2 == Some(true) {
if self.run.common.wasi.preview2 == Some(true) {
preview2::preview1::add_to_linker_sync(linker)?;
self.set_preview2_ctx(store)?;
} else {
Expand All @@ -780,7 +701,7 @@ impl RunCommand {
}
}

if self.common.wasi.nn == Some(true) {
if self.run.common.wasi.nn == Some(true) {
#[cfg(not(feature = "wasi-nn"))]
{
bail!("Cannot enable wasi-nn when the binary is not compiled with this feature.");
Expand Down Expand Up @@ -810,6 +731,7 @@ impl RunCommand {
}
}
let graphs = self
.run
.common
.wasi
.nn_graph
Expand All @@ -821,7 +743,7 @@ impl RunCommand {
}
}

if self.common.wasi.threads == Some(true) {
if self.run.common.wasi.threads == Some(true) {
#[cfg(not(feature = "wasi-threads"))]
{
// Silence the unused warning for `module` as it is only used in the
Expand Down Expand Up @@ -849,7 +771,7 @@ impl RunCommand {
}
}

if self.common.wasi.http == Some(true) {
if self.run.common.wasi.http == Some(true) {
#[cfg(not(all(feature = "wasi-http", feature = "component-model")))]
{
bail!("Cannot enable wasi-http when the binary is not compiled with this feature.");
Expand Down Expand Up @@ -887,7 +809,7 @@ impl RunCommand {

let mut num_fd: usize = 3;

if self.common.wasi.listenfd == Some(true) {
if self.run.common.wasi.listenfd == Some(true) {
num_fd = ctx_set_listenfd(num_fd, &mut builder)?;
}

Expand Down Expand Up @@ -917,7 +839,7 @@ impl RunCommand {
builder.env(key, &value);
}

if self.common.wasi.listenfd == Some(true) {
if self.run.common.wasi.listenfd == Some(true) {
bail!("components do not support --listenfd");
}
for _ in self.compute_preopen_sockets()? {
Expand All @@ -933,7 +855,7 @@ impl RunCommand {
);
}

if self.common.wasi.inherit_network == Some(true) {
if self.run.common.wasi.inherit_network == Some(true) {
builder.inherit_network(ambient_authority());
}
if let Some(enable) = self.common.wasi.allow_ip_name_lookup {
Expand Down
Loading
Loading