changeset 8069:1048edb5434a

Merge
author coleenp
date Tue, 19 Feb 2013 13:33:39 -0500
parents 5cd2fac2ae70 (diff) 56c364daccc3 (current diff)
children 20fff74158eb 1b0dc9f87e75 4c1d8002ffb1
files
diffstat 3 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp	Tue Feb 19 11:36:52 2013 -0500
+++ b/src/os/bsd/vm/os_bsd.cpp	Tue Feb 19 13:33:39 2013 -0500
@@ -2887,7 +2887,9 @@
 
 void signalHandler(int sig, siginfo_t* info, void* uc) {
   assert(info != NULL && uc != NULL, "it must be old kernel");
+  int orig_errno = errno;  // Preserve errno value over signal handler.
   JVM_handle_bsd_signal(sig, info, uc, true);
+  errno = orig_errno;
 }
 
 
--- a/src/os/linux/vm/os_linux.cpp	Tue Feb 19 11:36:52 2013 -0500
+++ b/src/os/linux/vm/os_linux.cpp	Tue Feb 19 13:33:39 2013 -0500
@@ -3653,7 +3653,9 @@
 
 void signalHandler(int sig, siginfo_t* info, void* uc) {
   assert(info != NULL && uc != NULL, "it must be old kernel");
+  int orig_errno = errno;  // Preserve errno value over signal handler.
   JVM_handle_linux_signal(sig, info, uc, true);
+  errno = orig_errno;
 }
 
 
--- a/src/os/solaris/vm/os_solaris.cpp	Tue Feb 19 11:36:52 2013 -0500
+++ b/src/os/solaris/vm/os_solaris.cpp	Tue Feb 19 13:33:39 2013 -0500
@@ -4317,7 +4317,9 @@
 
 
 void signalHandler(int sig, siginfo_t* info, void* ucVoid) {
+  int orig_errno = errno;  // Preserve errno value over signal handler.
   JVM_handle_solaris_signal(sig, info, ucVoid, true);
+  errno = orig_errno;
 }
 
 /* Do not delete - if guarantee is ever removed,  a signal handler (even empty)