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

8222252: Java ergonomics limits heap to 128GB with disabled compressed oops

Browse source 
Reviewed-by: dholmes
This commit is contained in:
Bob Vandette 2019-05-30 07:07:15 -04:00
parent 90fb4990ed
commit 087c3a9c3a
1 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/hotspot/share/runtime/arguments.cpp
View file

@ -1722,9 +1722,33 @@ julong Arguments::limit_by_allocatable_memory(julong limit) {
static const size_t DefaultHeapBaseMinAddress = HeapBaseMinAddress; static const size_t DefaultHeapBaseMinAddress = HeapBaseMinAddress;
void Arguments::set_heap_size() { void Arguments::set_heap_size() {
julong phys_mem = julong phys_mem;
FLAG_IS_DEFAULT(MaxRAM) ? MIN2(os::physical_memory(), (julong)MaxRAM)
// If the user specified one of these options, they
// want specific memory sizing so do not limit memory
// based on compressed oops addressability.
// Also, memory limits will be calculated based on
// available os physical memory, not our MaxRAM limit,
// unless MaxRAM is also specified.
bool override_coop_limit = (!FLAG_IS_DEFAULT(MaxRAMPercentage) ||
!FLAG_IS_DEFAULT(MaxRAMFraction) ||
!FLAG_IS_DEFAULT(MinRAMPercentage) ||
!FLAG_IS_DEFAULT(MinRAMFraction) ||
!FLAG_IS_DEFAULT(InitialRAMPercentage) ||
!FLAG_IS_DEFAULT(InitialRAMFraction) ||
!FLAG_IS_DEFAULT(MaxRAM));
if (override_coop_limit) {
if (FLAG_IS_DEFAULT(MaxRAM)) {
phys_mem = os::physical_memory();
FLAG_SET_ERGO(MaxRAM, (uint64_t)phys_mem);
} else {
phys_mem = (julong)MaxRAM;
}
} else {
phys_mem = FLAG_IS_DEFAULT(MaxRAM) ? MIN2(os::physical_memory(), (julong)MaxRAM)
: (julong)MaxRAM; : (julong)MaxRAM;
}
// Convert deprecated flags // Convert deprecated flags
if (FLAG_IS_DEFAULT(MaxRAMPercentage) && if (FLAG_IS_DEFAULT(MaxRAMPercentage) &&
@ -1780,8 +1804,20 @@ void Arguments::set_heap_size() {
// but it should be not less than default MaxHeapSize. // but it should be not less than default MaxHeapSize.
max_coop_heap -= HeapBaseMinAddress; max_coop_heap -= HeapBaseMinAddress;
} }
// If user specified flags prioritizing os physical
// memory limits, then disable compressed oops if
// limits exceed max_coop_heap and UseCompressedOops
// was not specified.
if (reasonable_max > max_coop_heap) {
if (FLAG_IS_ERGO(UseCompressedOops) && override_coop_limit) {
FLAG_SET_ERGO(UseCompressedOops, false);
FLAG_SET_ERGO(UseCompressedClassPointers, false);
} else {
reasonable_max = MIN2(reasonable_max, max_coop_heap); reasonable_max = MIN2(reasonable_max, max_coop_heap);
} }
}
}
reasonable_max = limit_by_allocatable_memory(reasonable_max); reasonable_max = limit_by_allocatable_memory(reasonable_max);
if (!FLAG_IS_DEFAULT(InitialHeapSize)) { if (!FLAG_IS_DEFAULT(InitialHeapSize)) {