comparison src/share/vm/runtime/arguments.cpp @ 20294:dd219eaec9cc

8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account Summary: Also consider os::vm_allocation_granularity in the calculation. Reviewed-by: brutisso
author tschatzl
date Mon, 21 Jul 2014 09:59:54 +0200
parents bcd72ab4d91f
children ee019285a52c
comparison
equal deleted inserted replaced
20293:7df07d855c8e 20294:dd219eaec9cc
1503 heap_alignment = ParallelScavengeHeap::conservative_max_heap_alignment(); 1503 heap_alignment = ParallelScavengeHeap::conservative_max_heap_alignment();
1504 } else if (UseG1GC) { 1504 } else if (UseG1GC) {
1505 heap_alignment = G1CollectedHeap::conservative_max_heap_alignment(); 1505 heap_alignment = G1CollectedHeap::conservative_max_heap_alignment();
1506 } 1506 }
1507 #endif // INCLUDE_ALL_GCS 1507 #endif // INCLUDE_ALL_GCS
1508 _conservative_max_heap_alignment = MAX3(heap_alignment, os::max_page_size(), 1508 _conservative_max_heap_alignment = MAX4(heap_alignment,
1509 CollectorPolicy::compute_heap_alignment()); 1509 (size_t)os::vm_allocation_granularity(),
1510 os::max_page_size(),
1511 CollectorPolicy::compute_heap_alignment());
1510 } 1512 }
1511 1513
1512 void Arguments::set_ergonomics_flags() { 1514 void Arguments::set_ergonomics_flags() {
1513 1515
1514 if (os::is_server_class_machine()) { 1516 if (os::is_server_class_machine()) {