--- a/src/hotspot/os/bsd/os_bsd.cpp Wed Mar 13 02:48:09 2019 +0000
+++ b/src/hotspot/os/bsd/os_bsd.cpp Wed Mar 13 00:48:52 2019 -0400
@@ -2658,11 +2658,6 @@
bool os::Bsd::signal_handlers_are_installed = false;
// For signal-chaining
-struct sigaction sigact[NSIG];
-uint32_t sigs = 0;
-#if (32 < NSIG-1)
-#error "Not all signals can be encoded in sigs. Adapt its type!"
-#endif
bool os::Bsd::libjsig_is_loaded = false;
typedef struct sigaction *(*get_signal_t)(int);
get_signal_t os::Bsd::get_signal_action = NULL;
@@ -2676,7 +2671,7 @@
}
if (actp == NULL) {
// Retrieve the preinstalled signal handler from jvm
- actp = get_preinstalled_handler(sig);
+ actp = os::Posix::get_preinstalled_handler(sig);
}
return actp;
@@ -2739,19 +2734,6 @@
return chained;
}
-struct sigaction* os::Bsd::get_preinstalled_handler(int sig) {
- if ((((uint32_t)1 << (sig-1)) & sigs) != 0) {
- return &sigact[sig];
- }
- return NULL;
-}
-
-void os::Bsd::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
- assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
- sigact[sig] = oldAct;
- sigs |= (uint32_t)1 << (sig-1);
-}
-
// for diagnostic
int sigflags[NSIG];
@@ -2783,7 +2765,7 @@
return;
} else if (UseSignalChaining) {
// save the old handler in jvm
- save_preinstalled_handler(sig, oldAct);
+ os::Posix::save_preinstalled_handler(sig, oldAct);
// libjsig also interposes the sigaction() call below and saves the
// old sigaction on it own.
} else {