Skip to content

8294594: Fix cast-function-type warnings in signal handling code #4125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8294594: Fix cast-function-type warnings in signal handling code #4125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/hotspot/os/posix/signals_posix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ static address get_signal_handler(const struct sigaction* action) {

typedef int (*os_sigaction_t)(int, const struct sigaction *, struct sigaction *);

static void SR_handler(int sig, siginfo_t* siginfo, ucontext_t* context);
static void SR_handler(int sig, siginfo_t* siginfo, void* ucVoid);

// Semantically compare two sigaction structures. Return true if they are referring to
// the same handler, using the same flags.
Expand Down Expand Up @@ -1565,8 +1565,8 @@ static void resume_clear_context(OSThread *osthread) {
osthread->set_siginfo(NULL);
}

static void suspend_save_context(OSThread *osthread, siginfo_t* siginfo, ucontext_t* context) {
osthread->set_ucontext(context);
static void suspend_save_context(OSThread *osthread, siginfo_t* siginfo, void* ucVoid) {
osthread->set_ucontext((ucontext_t*)ucVoid);
osthread->set_siginfo(siginfo);
}

Expand All @@ -1583,7 +1583,7 @@ static void suspend_save_context(OSThread *osthread, siginfo_t* siginfo, ucontex
//
// Currently only ever called on the VMThread and JavaThreads (PC sampling)
//
static void SR_handler(int sig, siginfo_t* siginfo, ucontext_t* context) {
static void SR_handler(int sig, siginfo_t* siginfo, void* ucVoid) {

// Save and restore errno to avoid confusing native code with EINTR
// after sigsuspend.
Expand Down Expand Up @@ -1611,7 +1611,7 @@ static void SR_handler(int sig, siginfo_t* siginfo, ucontext_t* context) {
os::SuspendResume::State current = osthread->sr.state();

if (current == os::SuspendResume::SR_SUSPEND_REQUEST) {
suspend_save_context(osthread, siginfo, context);
suspend_save_context(osthread, siginfo, ucVoid);

// attempt to switch the state, we assume we had a SUSPEND_REQUEST
os::SuspendResume::State state = osthread->sr.suspended();
Expand Down Expand Up @@ -1680,7 +1680,7 @@ int SR_initialize() {

// Set up signal handler for suspend/resume
act.sa_flags = SA_RESTART|SA_SIGINFO;
act.sa_handler = (void (*)(int)) SR_handler;
act.sa_sigaction = SR_handler;

// SR_signum is blocked by default.
pthread_sigmask(SIG_BLOCK, NULL, &act.sa_mask);
Expand Down