Mercurial > hg > graal-jvmci-8
diff src/share/vm/memory/heap.cpp @ 22974:c2ce24504334
8049864: TestParallelHeapSizeFlags fails with unexpected heap size
Reviewed-by: sjohanss, jmasa
author | ehelin |
---|---|
date | Tue, 24 Jun 2014 15:50:50 +0200 |
parents | 740e263c80c6 |
children | 5788dbd1f2d6 |
line wrap: on
line diff
--- a/src/share/vm/memory/heap.cpp Thu Dec 18 09:37:02 2014 +0100 +++ b/src/share/vm/memory/heap.cpp Tue Jun 24 15:50:50 2014 +0200 @@ -97,9 +97,13 @@ _log2_segment_size = exact_log2(segment_size); // Reserve and initialize space for _memory. - const size_t page_size = os::can_execute_large_page_memory() ? - os::page_size_for_region(committed_size, reserved_size, 8) : - os::vm_page_size(); + size_t page_size = os::vm_page_size(); + if (os::can_execute_large_page_memory()) { + const size_t min_pages = 8; + page_size = MIN2(os::page_size_for_region(committed_size, min_pages), + os::page_size_for_region(reserved_size, min_pages)); + } + const size_t granularity = os::vm_allocation_granularity(); const size_t r_align = MAX2(page_size, granularity); const size_t r_size = align_size_up(reserved_size, r_align);