Skip to content

8250637: UseOSErrorReporting times out (on Mac and Linux) #813

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 6 commits into from
Closed

8250637: UseOSErrorReporting times out (on Mac and Linux) #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f634064
reset signal handlers to their system defaults if handling crash with…
gerard-ziemski Oct 22, 2020
cb403c9
Revert "reset signal handlers to their system defaults if handling cr…
gerard-ziemski Oct 27, 2020
74d6c9a
Only use UseOsErrorReporting on Windows
gerard-ziemski Oct 27, 2020
b849b3c
make UseOSErrorReporting flag Windows only
gerard-ziemski Oct 28, 2020
c8badf5
last tweaks and fixes
gerard-ziemski Oct 29, 2020
e21976a
Fixed one more leftover UseOsErrorReporting to UseOSErrorReporting
gerard-ziemski Oct 30, 2020
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
1 change: 0 additions & 1 deletion src/hotspot/os/aix/globals_aix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
// Use Use64KPages or Use16MPages instead.
define_pd_global(bool, UseLargePages, false);
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;

#endif // OS_AIX_GLOBALS_AIX_HPP
1 change: 0 additions & 1 deletion src/hotspot/os/bsd/globals_bsd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
//
define_pd_global(bool, UseLargePages, false);
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;

#endif // OS_BSD_GLOBALS_BSD_HPP
1 change: 0 additions & 1 deletion src/hotspot/os/linux/globals_linux.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
//
define_pd_global(bool, UseLargePages, false);
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;

#endif // OS_LINUX_GLOBALS_LINUX_HPP
19 changes: 10 additions & 9 deletions src/hotspot/os/windows/globals_windows.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,25 @@
//
// Declare Windows specific flags. They are not available on other platforms.
//
#define RUNTIME_OS_FLAGS(develop, \
develop_pd, \
product, \
product_pd, \
notproduct, \
range, \
constraint)
#define RUNTIME_OS_FLAGS(develop, \
develop_pd, \
product, \
product_pd, \
notproduct, \
range, \
constraint) \
\
product(bool, UseOSErrorReporting, false, \
"Let VM fatal error propagate to the OS (ie. WER on Windows)")

// end of RUNTIME_OS_FLAGS


//
// Defines Windows-specific default values. The flags are available on all
// platforms, but they may have different default values on other platforms.
//
define_pd_global(bool, UseLargePages, false);
define_pd_global(bool, UseLargePagesIndividualAllocation, true);
define_pd_global(bool, UseOSErrorReporting, false); // for now.
define_pd_global(bool, UseThreadPriorities, true) ;

#endif // OS_WINDOWS_GLOBALS_WINDOWS_HPP
2 changes: 1 addition & 1 deletion src/hotspot/os/windows/os_windows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@ static inline void report_error(Thread* t, DWORD exception_code,
address addr, void* siginfo, void* context) {
VMError::report_and_die(t, exception_code, addr, siginfo, context);

// If UseOsErrorReporting, this will return here and save the error file
// If UseOSErrorReporting, this will return here and save the error file
// somewhere where we can find it in the minidump.
}

Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/runtime/globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,6 @@ const intx ObjectAlignmentInBytes = 8;
"error log in case of a crash.") \
range(0, (uint64_t)max_jlong/1000) \
\
product_pd(bool, UseOSErrorReporting, \
"Let VM fatal error propagate to the OS (ie. WER on Windows)") \
\
product(bool, SuppressFatalErrorMessage, false, \
"Report NO fatal error message (avoid deadlock)") \
\
Expand Down
6 changes: 4 additions & 2 deletions src/hotspot/share/utilities/vmError.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,10 +1433,12 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
// are handled properly.
reset_signal_handlers();
} else {
// If UseOsErrorReporting we call this for each level of the call stack
#if defined(_WINDOWS)
// If UseOSErrorReporting we call this for each level of the call stack
// while searching for the exception handler. Only the first level needs
// to be reported.
if (UseOSErrorReporting && log_done) return;
#endif

// This is not the first error, see if it happened in a different thread
// or in the same thread during error reporting.
Expand Down Expand Up @@ -1626,7 +1628,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
OnError = NULL;
}

if (!UseOSErrorReporting) {
if (WINDOWS_ONLY(!UseOSErrorReporting) NOT_WINDOWS(true)) {
// os::abort() will call abort hooks, try it first.
static bool skip_os_abort = false;
if (!skip_os_abort) {
Expand Down