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

8024137: Flags should be set using the proper macro

Browse Source 
Reviewed-by: sangheki, drwhite, jmasa
This commit is contained in:
Jesper Wilhelmsson 2016-06-21 19:37:30 +02:00
parent 464bfe497d
commit f2490e9194
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/gc/g1/g1YoungGenSizer.cpp
View File

@ -45,7 +45,7 @@ G1YoungGenSizer::G1YoungGenSizer() : _sizer_kind(SizerDefaults), _adaptive_size(
"A new max generation size of " SIZE_FORMAT "k will be used.",
NewSize/K, MaxNewSize/K, NewSize/K);
}
MaxNewSize = NewSize;
FLAG_SET_ERGO(size_t, MaxNewSize, NewSize);
}
if (FLAG_IS_CMDLINE(NewSize)) {

21
hotspot/src/share/vm/gc/shared/collectorPolicy.cpp
View File

@ -50,7 +50,6 @@ CollectorPolicy::CollectorPolicy() :
_initial_heap_byte_size(InitialHeapSize),
_max_heap_byte_size(MaxHeapSize),
_min_heap_byte_size(Arguments::min_heap_size()),
_max_heap_size_cmdline(false),
_size_policy(NULL),
_should_clear_all_soft_refs(false),
_all_soft_refs_clear(false)
@ -92,7 +91,6 @@ void CollectorPolicy::initialize_flags() {
if (_min_heap_byte_size != 0 && MaxHeapSize < _min_heap_byte_size) {
vm_exit_during_initialization("Incompatible minimum and maximum heap sizes specified");
}
_max_heap_size_cmdline = true;
}
// Check heap parameter properties
@ -285,7 +283,7 @@ void GenCollectorPolicy::initialize_flags() {
"heap_alignment: " SIZE_FORMAT " not aligned by gen_alignment: " SIZE_FORMAT,
_heap_alignment, _gen_alignment);
// All generational heaps have a youngest gen; handle those flags here
// All generational heaps have a young gen; handle those flags here
// Make sure the heap is large enough for two generations
size_t smallest_new_size = young_gen_size_lower_bound();
@ -307,7 +305,7 @@ void GenCollectorPolicy::initialize_flags() {
// Make sure NewSize allows an old generation to fit even if set on the command line
if (FLAG_IS_CMDLINE(NewSize) && NewSize >= _initial_heap_byte_size) {
log_warning(gc, ergo)("NewSize was set larger than initial heap size, will use initial heap size.");
NewSize = bound_minus_alignment(NewSize, _initial_heap_byte_size);
FLAG_SET_ERGO(size_t, NewSize, bound_minus_alignment(NewSize, _initial_heap_byte_size));
}
// Now take the actual NewSize into account. We will silently increase NewSize
@ -315,10 +313,7 @@ void GenCollectorPolicy::initialize_flags() {
size_t bounded_new_size = bound_minus_alignment(NewSize, MaxHeapSize);
bounded_new_size = MAX2(smallest_new_size, (size_t)align_size_down(bounded_new_size, _gen_alignment));
if (bounded_new_size != NewSize) {
// Do not use FLAG_SET_ERGO to update NewSize here, since this will override
// if NewSize was set on the command line or not. This information is needed
// later when setting the initial and minimum young generation size.
NewSize = bounded_new_size;
FLAG_SET_ERGO(size_t, NewSize, bounded_new_size);
}
_min_young_size = smallest_new_size;
_initial_young_size = NewSize;
@ -361,11 +356,11 @@ void GenCollectorPolicy::initialize_flags() {
vm_exit_during_initialization("Invalid young gen ratio specified");
}
OldSize = MAX2(OldSize, old_gen_size_lower_bound());
if (OldSize < old_gen_size_lower_bound()) {
FLAG_SET_ERGO(size_t, OldSize, old_gen_size_lower_bound());
}
if (!is_size_aligned(OldSize, _gen_alignment)) {
// Setting OldSize directly to preserve information about the possible
// setting of OldSize on the command line.
OldSize = align_size_down(OldSize, _gen_alignment);
FLAG_SET_ERGO(size_t, OldSize, align_size_down(OldSize, _gen_alignment));
}
if (FLAG_IS_CMDLINE(OldSize) && FLAG_IS_DEFAULT(MaxHeapSize)) {
@ -384,7 +379,7 @@ void GenCollectorPolicy::initialize_flags() {
// Adjust NewSize and OldSize or MaxHeapSize to match each other
if (NewSize + OldSize > MaxHeapSize) {
if (_max_heap_size_cmdline) {
if (FLAG_IS_CMDLINE(MaxHeapSize)) {
// Somebody has set a maximum heap size with the intention that we should not
// exceed it. Adjust New/OldSize as necessary.
size_t calculated_size = NewSize + OldSize;

4
hotspot/src/share/vm/gc/shared/collectorPolicy.hpp
View File

@ -72,10 +72,6 @@ class CollectorPolicy : public CHeapObj<mtGC> {
size_t _space_alignment;
size_t _heap_alignment;
// Needed to keep information if MaxHeapSize was set on the command line
// when the flag value is aligned etc by ergonomics.
bool _max_heap_size_cmdline;
// The sizing of the heap is controlled by a sizing policy.
AdaptiveSizePolicy* _size_policy;