mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the process exit to after the WASI cleanup and added some flushing of stdout and stderr

Browse Source
This commit is contained in:
Johnathan Sharratt
2023-03-17 00:45:33 +11:00
parent 7afc8691e6
commit 461c208c15
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cli/src/commands/run.rs
View File

@@ -193,7 +193,7 @@ impl RunWithPathBuf {
}
}
fn inner_module_run(&self, store: &mut Store, instance: Instance) -> Result<()> {
fn inner_module_run(&self, store: &mut Store, instance: Instance) -> Result<i32> {
// If this module exports an _initialize function, run that first.
if let Ok(initialize) = instance.exports.get_function("_initialize") {
initialize
@@ -216,12 +216,12 @@ impl RunWithPathBuf {
let start: Function = self.try_find_function(&instance, "_start", &[])?;
let result = start.call(store, &[]);
#[cfg(feature = "wasi")]
self.wasi.handle_result(result)?;
return self.wasi.handle_result(result);
#[cfg(not(feature = "wasi"))]
result?;
return Ok(result?);
}
Ok(())
Ok(0)
}
fn inner_execute(&self) -> Result<()> {
@@ -326,6 +326,7 @@ impl RunWithPathBuf {
let res = self.inner_module_run(&mut store, instance);
ctx.cleanup(&mut store, None);
res
}
// not WASI
@@ -334,7 +335,12 @@ impl RunWithPathBuf {
self.inner_module_run(&mut store, instance)
}
}
};
}.map(|exit_code| {
std::io::stdout().flush().ok();
std::io::stderr().flush().ok();
std::process::exit(exit_code);
});
#[cfg(not(feature = "wasi"))]
let ret = {
let instance = Instance::new(&module, &imports! {})?;

7
lib/cli/src/commands/run/wasi.rs
View File

@@ -198,14 +198,13 @@ impl Wasi {
}
/// Helper function for handling the result of a Wasi _start function.
pub fn handle_result(&self, result: Result<Box<[Value]>, RuntimeError>) -> Result<()> {
pub fn handle_result(&self, result: Result<Box<[Value]>, RuntimeError>) -> Result<i32> {
match result {
Ok(_) => Ok(()),
Ok(_) => Ok(0),
Err(err) => {
let err: anyhow::Error = match err.downcast::<WasiError>() {
Ok(WasiError::Exit(exit_code)) => {
// We should exit with the provided exit code
std::process::exit(exit_code.into());
return Ok(exit_code.raw());
}
Ok(err) => err.into(),
Err(err) => err.into(),