stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Coleen Phillimore 2015-11-18 19:55:37 +00:00
commit 6626f4fc68
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/runtime/commandLineFlagRangeList.cpp
View File

@ -279,7 +279,7 @@ void emit_range_double(const char* name, double min, double max) {
// Generate func argument to pass into emit_range_xxx functions // Generate func argument to pass into emit_range_xxx functions
#define EMIT_RANGE_CHECK(a, b) , a, b #define EMIT_RANGE_CHECK(a, b) , a, b
#define INITIAL_RANGES_SIZE 204 #define INITIAL_RANGES_SIZE 205
GrowableArray<CommandLineFlagRange*>* CommandLineFlagRangeList::_ranges = NULL; GrowableArray<CommandLineFlagRange*>* CommandLineFlagRangeList::_ranges = NULL;
// Check the ranges of all flags that have them // Check the ranges of all flags that have them

3
hotspot/src/share/vm/runtime/globals.hpp
View File

@ -1031,9 +1031,10 @@ public:
product(bool, CreateCoredumpOnCrash, true, \ product(bool, CreateCoredumpOnCrash, true, \
"Create core/mini dump on VM fatal error") \ "Create core/mini dump on VM fatal error") \
\ \
product(uintx, ErrorLogTimeout, 2 * 60, \ product(uint64_t, ErrorLogTimeout, 2 * 60, \
"Timeout, in seconds, to limit the time spent on writing an " \ "Timeout, in seconds, to limit the time spent on writing an " \
"error log in case of a crash.") \ "error log in case of a crash.") \
range(0, (uint64_t)max_jlong/1000) \
\ \
product_pd(bool, UseOSErrorReporting, \ product_pd(bool, UseOSErrorReporting, \
"Let VM fatal error propagate to the OS (ie. WER on Windows)") \ "Let VM fatal error propagate to the OS (ie. WER on Windows)") \

2
hotspot/src/share/vm/runtime/thread.cpp
View File

@ -1299,7 +1299,7 @@ void WatcherThread::run() {
if (!ShowMessageBoxOnError if (!ShowMessageBoxOnError
&& (OnError == NULL || OnError[0] == '\0') && (OnError == NULL || OnError[0] == '\0')
&& Arguments::abort_hook() == NULL) { && Arguments::abort_hook() == NULL) {
os::sleep(this, ErrorLogTimeout * 60 * 1000, false); os::sleep(this, (jlong)ErrorLogTimeout * 1000, false); // in seconds
fdStream err(defaultStream::output_fd()); fdStream err(defaultStream::output_fd());
err.print_raw_cr("# [ timer expired, abort... ]"); err.print_raw_cr("# [ timer expired, abort... ]");
// skip atexit/vm_exit/vm_abort hooks // skip atexit/vm_exit/vm_abort hooks