archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8150984: Invalid VM argument causes crash -XX:G1ConcRefinementServiceIntervalMillis=2147483648

Browse source 
Change maximum range so it can't be negative

Reviewed-by: kbarrett, sangheki
This commit is contained in:
Joseph Provino 2016-03-03 12:20:22 -05:00
parent 12d9b13eee
commit 7c23a31489
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp
View file

@ -68,7 +68,7 @@ ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *nex
void ConcurrentG1RefineThread::initialize() { void ConcurrentG1RefineThread::initialize() {
// Current thread activation threshold // Current thread activation threshold
_threshold = MIN2(cg1r()->thread_threshold_step() * (_worker_id + 1) + cg1r()->green_zone(), _threshold = MIN2(cg1r()->thread_threshold_step() * (_worker_id + 1) + cg1r()->green_zone(),
cg1r()->yellow_zone()); cg1r()->yellow_zone());
// A thread deactivates once the number of buffer reached a deactivation threshold // A thread deactivates once the number of buffer reached a deactivation threshold
_deactivation_threshold = _deactivation_threshold =
MAX2(_threshold - MIN2(_threshold, cg1r()->thread_threshold_step()), MAX2(_threshold - MIN2(_threshold, cg1r()->thread_threshold_step()),

2
hotspot/src/share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp
View file

@ -70,7 +70,7 @@ G1YoungRemSetSamplingThread::G1YoungRemSetSamplingThread() :
void G1YoungRemSetSamplingThread::sleep_before_next_cycle() { void G1YoungRemSetSamplingThread::sleep_before_next_cycle() {
MutexLockerEx x(&_monitor, Mutex::_no_safepoint_check_flag); MutexLockerEx x(&_monitor, Mutex::_no_safepoint_check_flag);
if (!_should_terminate) { if (!_should_terminate) {
intx waitms = G1ConcRefinementServiceIntervalMillis; // 300, really should be? uintx waitms = G1ConcRefinementServiceIntervalMillis; // 300, really should be?
_monitor.wait(Mutex::_no_safepoint_check_flag, waitms); _monitor.wait(Mutex::_no_safepoint_check_flag, waitms);
} }
} }

8
hotspot/src/share/vm/gc/g1/g1_globals.hpp
View file

@ -107,25 +107,25 @@
"Number of enqueued update buffers that will " \ "Number of enqueued update buffers that will " \
"trigger concurrent processing. Will be selected ergonomically " \ "trigger concurrent processing. Will be selected ergonomically " \
"by default.") \ "by default.") \
range(0, SIZE_MAX) \ range(0, max_intx) \
\ \
product(size_t, G1ConcRefinementRedZone, 0, \ product(size_t, G1ConcRefinementRedZone, 0, \
"Maximum number of enqueued update buffers before mutator " \ "Maximum number of enqueued update buffers before mutator " \
"threads start processing new ones instead of enqueueing them. " \ "threads start processing new ones instead of enqueueing them. " \
"Will be selected ergonomically by default. Zero will disable " \ "Will be selected ergonomically by default. Zero will disable " \
"concurrent processing.") \ "concurrent processing.") \
range(0, SIZE_MAX) \ range(0, max_intx) \
\ \
product(size_t, G1ConcRefinementGreenZone, 0, \ product(size_t, G1ConcRefinementGreenZone, 0, \
"The number of update buffers that are left in the queue by the " \ "The number of update buffers that are left in the queue by the " \
"concurrent processing threads. Will be selected ergonomically " \ "concurrent processing threads. Will be selected ergonomically " \
"by default.") \ "by default.") \
range(0, SIZE_MAX) \ range(0, max_intx) \
\ \
product(uintx, G1ConcRefinementServiceIntervalMillis, 300, \ product(uintx, G1ConcRefinementServiceIntervalMillis, 300, \
"The last concurrent refinement thread wakes up every " \ "The last concurrent refinement thread wakes up every " \
"specified number of milliseconds to do miscellaneous work.") \ "specified number of milliseconds to do miscellaneous work.") \
range(0, max_uintx) \ range(0, max_jint) \
\ \
product(size_t, G1ConcRefinementThresholdStep, 0, \ product(size_t, G1ConcRefinementThresholdStep, 0, \
"Each time the rset update queue increases by this amount " \ "Each time the rset update queue increases by this amount " \