Simplify the signalhandlers module (#854)
* Remove the unused EnsureDarwinMachPorts function When compiling the C++ shims for longjmp/setjmp/signal handling we don't use the `USE_APPLE_MACH_PORTS` directive, so this function was entirely unused anyway. This looks to be a holdover from when this was originally copied from C++, but no need for keeping around this now-legacy initialization. * Remove the `wasmtime_init_finish` function This looks like it's perhaps largely historical cruft at this point now I think? The function, with the removal of the mach ports from the previous commit, only reads the initializtion state of the signal handlers. If the signal handlers failed to get installed, though, it simply returns early rather than erroring out anyway. In any case a follow-up commit will refactor `wasmtime_init_eager` to handle this as well. * Pare down `wasmtime_init_eager` Similar to previous commits it looks like this function may have accrued some debt over time, nowadays it doesn't really do much other than capture a backtrace and install signal handlers. The `lazy_static` state isn't really that necessary and we can rely on the `Once` primitive in the standard library for one-time initialization. This also updates the code to unconditionally panic if signal handlers fail to get installed, which I think is the behavior that we'll want for now and we can enhance it over time if necessary, but I don't think we have a use case where it's currently necessary.
This commit is contained in:
@@ -7,7 +7,7 @@ use crate::imports::Imports;
|
||||
use crate::jit_int::GdbJitImageRegistration;
|
||||
use crate::memory::LinearMemory;
|
||||
use crate::mmap::Mmap;
|
||||
use crate::signalhandlers::{wasmtime_init_eager, wasmtime_init_finish};
|
||||
use crate::signalhandlers;
|
||||
use crate::table::Table;
|
||||
use crate::traphandlers::{wasmtime_call, Trap};
|
||||
use crate::vmcontext::{
|
||||
@@ -611,14 +611,6 @@ impl Instance {
|
||||
index
|
||||
}
|
||||
|
||||
/// Test whether any of the objects inside this instance require signal
|
||||
/// handlers to catch out of bounds accesses.
|
||||
pub(crate) fn needs_signal_handlers(&self) -> bool {
|
||||
self.memories
|
||||
.values()
|
||||
.any(|memory| memory.needs_signal_handlers)
|
||||
}
|
||||
|
||||
/// Grow memory by the specified amount of pages.
|
||||
///
|
||||
/// Returns `None` if memory can't be grown by the specified amount
|
||||
@@ -871,8 +863,7 @@ impl InstanceHandle {
|
||||
|
||||
// Ensure that our signal handlers are ready for action.
|
||||
// TODO: Move these calls out of `InstanceHandle`.
|
||||
wasmtime_init_eager();
|
||||
wasmtime_init_finish(instance.vmctx_mut());
|
||||
signalhandlers::init();
|
||||
|
||||
// The WebAssembly spec specifies that the start function is
|
||||
// invoked automatically at instantiation time.
|
||||
|
||||
Reference in New Issue
Block a user