extend preview1 support

- support sleep support
- support to determine the environment variables and the process
  arguments
- remove the integration of a demo wasm module
- avoid building unneeded wasm file

Author: stlankes

examples/hermit-wasm/Cargo.toml

@@ -15,7 +15,6 @@ name = "hermit_wasm"
 
 [features]
 default = []
-ci = []
 
 [dependencies]
 anyhow = "1.0"

examples/hermit-wasm/build.rs

@@ -1,7 +1,7 @@
 #![feature(thread_local)]
 #![feature(maybe_uninit_slice)]
-#![feature(duration_millis_float)]
 
+use std::ffi::OsString;
 use std::time::Instant;
 
 use anyhow::{Context, Result};
@@ -17,7 +17,11 @@ mod capi;
 #[cfg(target_os = "hermit")]
 mod preview1;
 
-pub fn run_preview1(module_bytes: &[u8], config: &wasmtime::Config) -> Result<()> {
+pub fn run_preview1(
+	module_bytes: &[u8],
+	config: &wasmtime::Config,
+	#[allow(unused_variables)] module_and_args: &'static [OsString],
+) -> Result<()> {
 	let engine = Engine::new(config)?;
 	debug!("Wasmtime engine is configured as followed: {config:?}");
 
@@ -38,7 +42,7 @@ pub fn run_preview1(module_bytes: &[u8], config: &wasmtime::Config) -> Result<()
 	{
 		let mut imports = module.imports();
 		if imports.any(|i| i.module() == "wasi_snapshot_preview1") {
-			preview1::init(&mut linker)?;
+			preview1::init(&mut linker, module_and_args)?;
 		}
 	}
 

examples/hermit-wasm/src/lib.rs

@@ -1,7 +1,7 @@
-#![allow(dependency_on_unit_never_type_fallback)]
-
+use std::ffi::OsString;
 use std::fs::File;
 use std::io::{Read, Write};
+use std::sync::LazyLock;
 
 use anyhow::Result;
 use chrono::Local;
@@ -14,17 +14,16 @@ use log::{LevelFilter, info};
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
+#[command(name = "hermit-wasm")]
 #[command(next_line_help = true)]
 pub struct Config {
-	/// File name of the WASM module
-	#[arg(short, long, value_name = "FILE")]
-	fname: Option<String>,
-
-	/// Defines the usage of the WebAssembly threads proposal for compilation
-	#[arg(short, long, default_value_t = false)]
-	threads: bool,
+	/// The WebAssembly module to run and arguments to pass to it.
+	#[arg(value_name = "WASM")]
+	pub module_and_args: Vec<OsString>,
 }
 
+static CONFIG: LazyLock<Config> = LazyLock::new(Config::parse);
+
 pub fn main() -> Result<()> {
 	Builder::new()
 		.filter_level(LevelFilter::Info)
@@ -41,34 +40,16 @@ pub fn main() -> Result<()> {
 		})
 		.init();
 
-	let args = Config::parse();
-
 	// First step is to create the Wasm execution engine with some config.
-	// In this example we are using the default configuration.
-	let mut config = wasmtime::Config::new();
-	config.wasm_threads(args.threads);
-
-	for argument in std::env::args() {
-		println!("{argument}");
-	}
-
-	if let Some(fname) = args.fname {
-		info!("Start Hermit-WASM!");
-
-		let mut buffer = Vec::new();
-		let mut f = File::open(fname)?;
+	// Currently, we are using the default configuration.
+	let config = wasmtime::Config::new();
 
-		f.read_to_end(&mut buffer)?;
+	info!("Start Hermit-WASM!");
 
-		run_preview1(buffer.as_slice(), &config)
-	} else {
-		info!("Start simple demo application in Hermit-WASM!");
+	let mut buffer = Vec::new();
+	let mut f = File::open(CONFIG.module_and_args[0].clone()).expect("Unable to open wasm module");
 
-		#[cfg(not(feature = "ci"))]
-		let module_bytes = include_bytes!(concat!(env!("OUT_DIR"), "/wasm-test.wasm"));
-		#[cfg(feature = "ci")]
-		let module_bytes = include_bytes!(concat!(env!("OUT_DIR"), "/hello_world.wasm"));
+	f.read_to_end(&mut buffer)?;
 
-		run_preview1(module_bytes, &config)
-	}
+	run_preview1(buffer.as_slice(), &config, &CONFIG.module_and_args)
 }