From 043b40bd02270f0d90d0863744e198fb2c933f38 Mon Sep 17 00:00:00 2001 From: Aleksei Voitylov Date: Tue, 1 Mar 2022 17:55:00 +0300 Subject: [PATCH] backport of JDK-8252248 to 11u --- src/java.base/linux/native/libnet/linux_close.c | 8 ++++---- src/java.base/unix/native/libnio/ch/NativeThread.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java.base/linux/native/libnet/linux_close.c b/src/java.base/linux/native/libnet/linux_close.c index af85e8df7d5..fdfe7bf5c21 100644 --- a/src/java.base/linux/native/libnet/linux_close.c +++ b/src/java.base/linux/native/libnet/linux_close.c @@ -60,7 +60,7 @@ typedef struct { /* * Signal to unblock thread */ -static int sigWakeup = (__SIGRTMAX - 2); +#define WAKEUP_SIGNAL (SIGRTMAX - 2) /* * fdTable holds one entry per file descriptor, up to a certain @@ -152,10 +152,10 @@ static void __attribute((constructor)) init() { sa.sa_handler = sig_wakeup; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); - sigaction(sigWakeup, &sa, NULL); + sigaction(WAKEUP_SIGNAL, &sa, NULL); sigemptyset(&sigset); - sigaddset(&sigset, sigWakeup); + sigaddset(&sigset, WAKEUP_SIGNAL); sigprocmask(SIG_UNBLOCK, &sigset, NULL); } @@ -305,7 +305,7 @@ static int closefd(int fd1, int fd2) { threadEntry_t *curr = fdEntry->threads; while (curr != NULL) { curr->intr = 1; - pthread_kill( curr->thr, sigWakeup ); + pthread_kill( curr->thr, WAKEUP_SIGNAL); curr = curr->next; } } diff --git a/src/java.base/unix/native/libnio/ch/NativeThread.c b/src/java.base/unix/native/libnio/ch/NativeThread.c index 5167aeccd0f..fdfe8d58d4c 100644 --- a/src/java.base/unix/native/libnio/ch/NativeThread.c +++ b/src/java.base/unix/native/libnio/ch/NativeThread.c @@ -36,7 +36,7 @@ #ifdef __linux__ #include /* Also defined in net/linux_close.c */ - #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) + #define INTERRUPT_SIGNAL (SIGRTMAX - 2) #elif _AIX #include /* Also defined in net/aix_close.c */