Update how exits are modeled in the C API (#5215)

Previously extracting an exit code was only possibly on a `wasm_trap_t`
which will never successfully have an exit code on it, so the exit code
extractor is moved over to `wasmtime_error_t`. Additionally extracting a
wasm trace from a `wasmtime_error_t` is added since traces happen on
both traps and errors now.
This commit is contained in:
Alex Crichton
2022-11-07 11:35:49 -06:00
committed by GitHub
parent 980e948239
commit b07b0676a3
4 changed files with 46 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
use crate::wasm_name_t;
use crate::{wasm_frame_vec_t, wasm_name_t};
use anyhow::{anyhow, Error, Result};
#[repr(C)]
@@ -37,3 +37,25 @@ pub(crate) fn bad_utf8() -> Option<Box<wasmtime_error_t>> {
pub extern "C" fn wasmtime_error_message(error: &wasmtime_error_t, message: &mut wasm_name_t) {
message.set_buffer(format!("{:?}", error.error).into_bytes());
}
#[no_mangle]
pub extern "C" fn wasmtime_error_exit_status(raw: &wasmtime_error_t, status: &mut i32) -> bool {
#[cfg(feature = "wasi")]
if let Some(exit) = raw.error.downcast_ref::<wasmtime_wasi::I32Exit>() {
*status = exit.0;
return true;
}
// Squash unused warnings in wasi-disabled builds.
drop((raw, status));
false
}
#[no_mangle]
pub extern "C" fn wasmtime_error_wasm_trace<'a>(
raw: &'a wasmtime_error_t,
out: &mut wasm_frame_vec_t<'a>,
) {
crate::trap::error_trace(&raw.error, out)
}