Remove some more unused code from the Solaris files. diff --git a/src/hotspot/os/solaris/os_solaris.hpp b/src/hotspot/os/solaris/os_solaris.hpp index 3d099dfb7..3e2c88324 100644 --- a/src/hotspot/os/solaris/os_solaris.hpp +++ b/src/hotspot/os/solaris/os_solaris.hpp @@ -160,8 +160,6 @@ class Solaris { static void synchronization_init(); static bool liblgrp_init(); - static void init_signal_mem(); - // Allows us to switch between lwp and thread -based synchronization static int mutex_lock(mutex_t *mx) { return _mutex_lock(mx); } static int mutex_trylock(mutex_t *mx) { return _mutex_trylock(mx); } diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp index 894958e7c..5273ea961 100644 --- a/src/hotspot/os/solaris/os_solaris.cpp +++ b/src/hotspot/os/solaris/os_solaris.cpp @@ -1581,37 +1581,6 @@ void os::print_jni_name_suffix_on(outputStream* st, int args_size) { // no suffix required } -// The following code is moved from os.cpp for making this -// code platform specific, which it is by its very nature. - -// a counter for each possible signal value -static int Sigexit = 0; -static jint *pending_signals = NULL; -static int *preinstalled_sigs = NULL; -static struct sigaction *chainedsigactions = NULL; -static Semaphore* sig_sem = NULL; - -void os::Solaris::init_signal_mem() { - // Initialize signal structures - Maxsignum = SIGRTMAX; - Sigexit = Maxsignum+1; - assert(Maxsignum >0, "Unable to obtain max signal number"); - - // Initialize signal structures - // pending_signals has one int per signal - // The additional signal is for SIGEXIT - exit signal to signal_thread - pending_signals = (jint *)os::malloc(sizeof(jint) * (Sigexit+1), mtInternal); - memset(pending_signals, 0, (sizeof(jint) * (Sigexit+1))); - - if (UseSignalChaining) { - chainedsigactions = (struct sigaction *)malloc(sizeof(struct sigaction) - * (Maxsignum + 1), mtInternal); - memset(chainedsigactions, 0, (sizeof(struct sigaction) * (Maxsignum + 1))); - preinstalled_sigs = (int *)os::malloc(sizeof(int) * (Maxsignum + 1), mtInternal); - memset(preinstalled_sigs, 0, (sizeof(int) * (Maxsignum + 1))); - } -} - //////////////////////////////////////////////////////////////////////////////// // Virtual Memory @@ -2903,7 +2872,6 @@ jint os::init_2(void) { FLAG_SET_ERGO_IF_DEFAULT(UseNUMAInterleaving, true); } - Solaris::init_signal_mem(); if (PosixSignals::init() == JNI_ERR) { return JNI_ERR; }