revert JVM_handle_XXX_signal change

Author: gerard-ziemski

make/hotspot/symbols/symbols-aix

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # questions.
 #
 
-JVM_handle_posix_signal
+JVM_handle_linux_signal
 numa_error
 numa_warn
 sysThreadAvailableStackWithSlack

make/hotspot/symbols/symbols-linux

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 # questions.
 #
 
-JVM_handle_posix_signal
+JVM_handle_linux_signal
 JVM_IsUseContainerSupport
 numa_error
 numa_warn

make/hotspot/symbols/symbols-macosx

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,4 +21,4 @@
 # questions.
 #
 
-JVM_handle_posix_signal
+JVM_handle_bsd_signal

src/hotspot/cpu/arm/vm_version_arm_32.cpp

@@ -107,7 +107,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ pldw(Address(R0));
     // Return true if instruction caused no signals
     __ mov(R0, 1);
-    // JVM_handle_posix_signal moves PC here if SIGILL happens
+    // JVM_handle_linux_signal moves PC here if SIGILL happens
     __ bx(LR);
 
     return start;

src/hotspot/os/posix/signals_posix.cpp

@@ -64,7 +64,7 @@ static sigset_t check_signal_done;
 static bool check_signals = true;
 
 // This boolean allows users to forward their own non-matching signals
-// to JVM_handle_posix_signal harmlessly.
+// to JVM_handle_bsd_signal/JVM_handle_linux_signal, harmlessly.
 static bool signal_handlers_are_installed = false;
 
 debug_only(static bool signal_sets_initialized = false);
@@ -432,9 +432,20 @@ bool PosixSignals::chained_handler(int sig, siginfo_t* siginfo, void* context) {
 // Note that the VM will print warnings if it detects conflicting signal
 // handlers, unless invoked with the option "-XX:+AllowUserSignalHandlers".
 //
-extern "C" JNIEXPORT int JVM_handle_posix_signal(int signo, siginfo_t* siginfo,
-                                                 void* ucontext,
-                                                 int abort_if_unrecognized);
+
+#if defined(BSD)
+extern "C" JNIEXPORT int JVM_handle_bsd_signal(int signo, siginfo_t* siginfo,
+                                               void* ucontext,
+                                               int abort_if_unrecognized);
+#elif defined(AIX)
+extern "C" JNIEXPORT int JVM_handle_aix_signal(int signo, siginfo_t* siginfo,
+                                               void* ucontext,
+                                               int abort_if_unrecognized);
+#else
+extern "C" JNIEXPORT int JVM_handle_linux_signal(int signo, siginfo_t* siginfo,
+                                               void* ucontext,
+                                               int abort_if_unrecognized);
+#endif
 
 // Function to unblock all signals which are, according
 // to POSIX, typical program error signals. If they happen while being blocked,
@@ -459,7 +470,13 @@ static void javaSignalHandler(int sig, siginfo_t* info, void* uc) {
   unblock_program_error_signals();
 
   int orig_errno = errno;  // Preserve errno value over signal handler.
-  JVM_handle_posix_signal(sig, info, uc, true);
+#if defined(BSD)
+  JVM_handle_bsd_signal(sig, info, uc, true);
+#elif defined(AIX)
+  JVM_handle_aix_signal(sig, info, uc, true);
+#else
+  JVM_handle_linux_signal(sig, info, uc, true);
+#endif
   errno = orig_errno;
 }
 

src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp

@@ -200,7 +200,7 @@ frame os::current_frame() {
 // Utility functions
 
 extern "C" JNIEXPORT int
-JVM_handle_posix_signal(int sig, siginfo_t* info, void* ucVoid, int abort_if_unrecognized) {
+JVM_handle_aix_signal(int sig, siginfo_t* info, void* ucVoid, int abort_if_unrecognized) {
 
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
@@ -211,7 +211,7 @@ JVM_handle_posix_signal(int sig, siginfo_t* info, void* ucVoid, int abort_if_unr
   // Note: it's not uncommon that JNI code uses signal/sigset to install
   // then restore certain signal handler (e.g. to temporarily block SIGPIPE,
   // or have a SIGILL handler when detecting CPU type). When that happens,
-  // JVM_handle_posix_signal() might be invoked with junk info/ucVoid. To
+  // JVM_handle_aix_signal() might be invoked with junk info/ucVoid. To
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 

src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp

@@ -422,7 +422,7 @@ enum {
 };
 
 extern "C" JNIEXPORT int
-JVM_handle_posix_signal(int sig,
+JVM_handle_bsd_signal(int sig,
                         siginfo_t* info,
                         void* ucVoid,
                         int abort_if_unrecognized) {
@@ -439,7 +439,7 @@ JVM_handle_posix_signal(int sig,
   // Note: it's not uncommon that JNI code uses signal/sigset to install
   // then restore certain signal handler (e.g. to temporarily block SIGPIPE,
   // or have a SIGILL handler when detecting CPU type). When that happens,
-  // JVM_handle_posix_signal() might be invoked with junk info/ucVoid. To
+  // JVM_handle_bsd_signal() might be invoked with junk info/ucVoid. To
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 

src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp

@@ -116,7 +116,7 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
 }
 
 extern "C" JNIEXPORT int
-JVM_handle_posix_signal(int sig,
+JVM_handle_bsd_signal(int sig,
                         siginfo_t* info,
                         void* ucVoid,
                         int abort_if_unrecognized) {
@@ -137,7 +137,7 @@ JVM_handle_posix_signal(int sig,
   // Note: it's not uncommon that JNI code uses signal/sigset to
   // install then restore certain signal handler (e.g. to temporarily
   // block SIGPIPE, or have a SIGILL handler when detecting CPU
-  // type). When that happens, JVM_handle_posix_signal() might be
+  // type). When that happens, JVM_handle_bsd_signal() might be
   // invoked with junk info/ucVoid. To avoid unnecessary crash when
   // libjsig is not preloaded, try handle signals that do not require
   // siginfo/ucontext first.

src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp

@@ -194,7 +194,7 @@ NOINLINE frame os::current_frame() {
 }
 
 extern "C" JNIEXPORT int
-JVM_handle_posix_signal(int sig,
+JVM_handle_linux_signal(int sig,
                         siginfo_t* info,
                         void* ucVoid,
                         int abort_if_unrecognized) {
@@ -211,7 +211,7 @@ JVM_handle_posix_signal(int sig,
   // Note: it's not uncommon that JNI code uses signal/sigset to install
   // then restore certain signal handler (e.g. to temporarily block SIGPIPE,
   // or have a SIGILL handler when detecting CPU type). When that happens,
-  // JVM_handle_posix_signal() might be invoked with junk info/ucVoid. To
+  // JVM_handle_linux_signal() might be invoked with junk info/ucVoid. To
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.
 

src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp

@@ -243,7 +243,7 @@ address check_mp_ext_fault_instr = NULL;
 
 // Utility functions
 
-extern "C" int JVM_handle_posix_signal(int sig, siginfo_t* info,
+extern "C" int JVM_handle_linux_signal(int sig, siginfo_t* info,
                                        void* ucVoid, int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
@@ -270,7 +270,7 @@ extern "C" int JVM_handle_posix_signal(int sig, siginfo_t* info,
   // Note: it's not uncommon that JNI code uses signal/sigset to install
   // then restore certain signal handler (e.g. to temporarily block SIGPIPE,
   // or have a SIGILL handler when detecting CPU type). When that happens,
-  // JVM_handle_posix_signal() might be invoked with junk info/ucVoid. To
+  // JVM_handle_linux_signal() might be invoked with junk info/ucVoid. To
   // avoid unnecessary crash when libjsig is not preloaded, try handle signals
   // that do not require siginfo/ucontext first.