diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp index 4e7b2e99e0f..d432a7a7ae7 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp @@ -1307,10 +1307,10 @@ G1RegionToSpaceMapper* G1CollectedHeap::create_aux_memory_mapper(const char* des os::trace_page_sizes_for_requested_size(description, size, - page_size, preferred_page_size, rs.base(), - rs.size()); + rs.size(), + page_size); return result; } @@ -1400,9 +1400,9 @@ jint G1CollectedHeap::initialize() { os::trace_page_sizes("Heap", MinHeapSize, reserved_byte_size, - page_size, heap_rs.base(), - heap_rs.size()); + heap_rs.size(), + page_size); heap_storage->set_mapping_changed_listener(&_listener); // Create storage for the BOT, card table and the bitmap. diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp index b394cb07d35..9cdd91652f0 100644 --- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp @@ -51,8 +51,8 @@ ParMarkBitMap::initialize(MemRegion covered_region) MAX2(page_sz, granularity); ReservedSpace rs(_reserved_byte_size, rs_align, page_sz); const size_t used_page_sz = rs.page_size(); - os::trace_page_sizes("Mark Bitmap", raw_bytes, raw_bytes, used_page_sz, - rs.base(), rs.size()); + os::trace_page_sizes("Mark Bitmap", raw_bytes, raw_bytes, + rs.base(), rs.size(), used_page_sz); MemTracker::record_virtual_memory_type((address)rs.base(), mtGC); diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp index 45e734231a5..57452cf07e5 100644 --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp @@ -785,9 +785,9 @@ void ParallelScavengeHeap::trace_actual_reserved_page_size(const size_t reserved os::trace_page_sizes("Heap", MinHeapSize, reserved_heap_size, - page_size, rs.base(), - rs.size()); + rs.size(), + page_size); } } diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index 64b2c0475f4..d0839cf576b 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -448,8 +448,8 @@ ParallelCompactData::create_vspace(size_t count, size_t element_size) const size_t rs_align = page_sz == os::vm_page_size() ? 0 : MAX2(page_sz, granularity); ReservedSpace rs(_reserved_byte_size, rs_align, page_sz); - os::trace_page_sizes("Parallel Compact Data", raw_bytes, raw_bytes, page_sz, rs.base(), - rs.size()); + os::trace_page_sizes("Parallel Compact Data", raw_bytes, raw_bytes, rs.base(), + rs.size(), page_sz); MemTracker::record_virtual_memory_type((address)rs.base(), mtGC); diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp index 4f2e0abbe95..ea173af015a 100644 --- a/src/hotspot/share/gc/shared/cardTable.cpp +++ b/src/hotspot/share/gc/shared/cardTable.cpp @@ -97,7 +97,7 @@ void CardTable::initialize(void* region0_start, void* region1_start) { MemTracker::record_virtual_memory_type((address)heap_rs.base(), mtGC); os::trace_page_sizes("Card Table", num_bytes, num_bytes, - _page_size, heap_rs.base(), heap_rs.size()); + heap_rs.base(), heap_rs.size(), _page_size); if (!heap_rs.is_reserved()) { vm_exit_during_initialization("Could not reserve enough space for the " "card marking array"); diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index 5e416d99472..f7e93d7d984 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -159,9 +159,9 @@ ReservedHeapSpace GenCollectedHeap::allocate(size_t alignment) { os::trace_page_sizes("Heap", MinHeapSize, total_reserved, - used_page_size, heap_rs.base(), - heap_rs.size()); + heap_rs.size(), + used_page_size); return heap_rs; } diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp index 99c980a2d9a..254869c03b1 100644 --- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp @@ -114,9 +114,9 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes) assert(is_aligned(_rs.size(), os::vm_allocation_granularity()), "invariant"); os::trace_page_sizes("Jfr", reservation_size_request_bytes, reservation_size_request_bytes, - os::vm_page_size(), _rs.base(), - _rs.size()); + _rs.size(), + os::vm_page_size()); MemTracker::record_virtual_memory_type((address)_rs.base(), mtTracing); assert(is_aligned(_rs.base(), os::vm_page_size()), "invariant"); assert(is_aligned(_rs.size(), os::vm_page_size()), "invariant"); diff --git a/src/hotspot/share/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp index c2fa593ea92..396faf99fde 100644 --- a/src/hotspot/share/memory/heap.cpp +++ b/src/hotspot/share/memory/heap.cpp @@ -212,8 +212,7 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s const size_t c_size = align_up(committed_size, page_size); assert(c_size <= rs.size(), "alignment made committed size to large"); - os::trace_page_sizes(_name, c_size, rs.size(), page_size, - rs.base(), rs.size()); + os::trace_page_sizes(_name, c_size, rs.size(), rs.base(), rs.size(), page_size); if (!_memory.initialize(rs, c_size)) { return false; } diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index 997bf3a968f..fe9772982a8 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -1655,43 +1655,43 @@ const char* os::errno_name(int e) { void os::trace_page_sizes(const char* str, const size_t region_min_size, const size_t region_max_size, - const size_t page_size, const char* base, - const size_t size) { + const size_t size, + const size_t page_size) { log_info(pagesize)("%s: " " min=" SIZE_FORMAT "%s" " max=" SIZE_FORMAT "%s" " base=" PTR_FORMAT - " page_size=" SIZE_FORMAT "%s" - " size=" SIZE_FORMAT "%s", + " size=" SIZE_FORMAT "%s" + " page_size=" SIZE_FORMAT "%s", str, trace_page_size_params(region_min_size), trace_page_size_params(region_max_size), p2i(base), - trace_page_size_params(page_size), - trace_page_size_params(size)); + trace_page_size_params(size), + trace_page_size_params(page_size)); } void os::trace_page_sizes_for_requested_size(const char* str, const size_t requested_size, - const size_t page_size, - const size_t alignment, + const size_t requested_page_size, const char* base, - const size_t size) { + const size_t size, + const size_t page_size) { log_info(pagesize)("%s:" " req_size=" SIZE_FORMAT "%s" + " req_page_size=" SIZE_FORMAT "%s" " base=" PTR_FORMAT - " page_size=" SIZE_FORMAT "%s" - " alignment=" SIZE_FORMAT "%s" - " size=" SIZE_FORMAT "%s", + " size=" SIZE_FORMAT "%s" + " page_size=" SIZE_FORMAT "%s", str, trace_page_size_params(requested_size), + trace_page_size_params(requested_page_size), p2i(base), - trace_page_size_params(page_size), - trace_page_size_params(alignment), - trace_page_size_params(size)); + trace_page_size_params(size), + trace_page_size_params(page_size)); } diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp index 49c56b3375e..1d704e29ac7 100644 --- a/src/hotspot/share/runtime/os.hpp +++ b/src/hotspot/share/runtime/os.hpp @@ -405,19 +405,18 @@ class os: AllStatic { // passed to page_size_for_region() and page_size should be the result of that // call. The (optional) base and size parameters should come from the // ReservedSpace base() and size() methods. - static void trace_page_sizes(const char* str, const size_t* page_sizes, int count); static void trace_page_sizes(const char* str, const size_t region_min_size, const size_t region_max_size, - const size_t page_size, const char* base, - const size_t size); + const size_t size, + const size_t page_size); static void trace_page_sizes_for_requested_size(const char* str, const size_t requested_size, - const size_t page_size, - const size_t alignment, + const size_t requested_page_size, const char* base, - const size_t size); + const size_t size, + const size_t page_size); static size_t vm_allocation_granularity() { return OSInfo::vm_allocation_granularity(); } diff --git a/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java index b9c556f94cd..0afd362c65a 100644 --- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java +++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java @@ -101,11 +101,11 @@ public class TestLargePageUseForAuxMemory { } static void checkSmallTables(OutputAnalyzer output, long expectedPageSize) throws Exception { - checkSize(output, expectedPageSize, "Block Offset Table: .*page_size=([^ ]+)"); + checkSize(output, expectedPageSize, "Block Offset Table: .* page_size=(\\d+[BKMG])"); } static void checkBitmap(OutputAnalyzer output, long expectedPageSize) throws Exception { - checkSize(output, expectedPageSize, "Mark Bitmap: .*page_size=([^ ]+)"); + checkSize(output, expectedPageSize, "Mark Bitmap: .* page_size=(\\d+[BKMG])"); } static List getOpts(long heapsize, boolean largePageEnabled) { @@ -126,6 +126,7 @@ public class TestLargePageUseForAuxMemory { pb = ProcessTools.createJavaProcessBuilder(getOpts(heapsize, true)); OutputAnalyzer output = new OutputAnalyzer(pb.start()); + // Only expect large page size if large pages are enabled. if (largePagesEnabled(output)) { checkSmallTables(output, (cardsShouldUseLargePages ? largePageSize : smallPageSize)); diff --git a/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java b/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java index 5255aae6e50..cfd59eadd3a 100644 --- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java +++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForHeap.java @@ -81,7 +81,7 @@ public class TestLargePageUseForHeap { } static void checkHeap(OutputAnalyzer output, long expectedPageSize) throws Exception { - checkSize(output, expectedPageSize, "Heap: .*page_size=([^ ]+)"); + checkSize(output, expectedPageSize, "Heap: .* page_size=(\\d+[BKMG])"); } static void testVM(long regionSize) throws Exception { diff --git a/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java b/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java index c894eb051a2..dbc0fd370ac 100644 --- a/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java +++ b/test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java @@ -95,7 +95,7 @@ public class TestG1NUMATouchRegions { } static long heapPageSize(OutputAnalyzer output) { - String HeapPageSizePattern = "Heap: .*page_size=([^ ]+)"; + String HeapPageSizePattern = "Heap: .* page_size=(\\d+[BKMG])"; String str = output.firstMatch(HeapPageSizePattern, 1); if (str == null) { diff --git a/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java b/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java index 7bc07d1c9c3..b24b1b34a06 100644 --- a/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java +++ b/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java @@ -258,7 +258,7 @@ public class TestTracePageSizes { parseSmaps(); // Setup patters for the JVM page size logging. - String traceLinePatternString = ".*base=(0x[0-9A-Fa-f]*).*page_size=([^ ]+).*"; + String traceLinePatternString = ".*base=(0x[0-9A-Fa-f]*).* page_size=(\\d+[BKMG]).*"; Pattern traceLinePattern = Pattern.compile(traceLinePatternString); // The test needs to be run with page size logging printed to ps-$pid.log.