Skip to content

Commit dc5c414

Browse files
jsikstrojsikstro
committed
8352762: Use EXACTFMT instead of expanded version where applicable
Reviewed-by: dholmes, stuefe
1 parent 2eeda64 commit dc5c414

File tree

8 files changed

+50
-70
lines changed

8 files changed

+50
-70
lines changed

‎src/hotspot/os/linux/os_linux.cpp

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3775,10 +3775,9 @@ static bool hugetlbfs_sanity_check(size_t page_size) {
37753775
munmap(p, page_size);
37763776
return true;
37773777
} else {
3778-
log_info(pagesize)("Large page size (%zu%s) failed sanity check, "
3778+
log_info(pagesize)("Large page size (" EXACTFMT ") failed sanity check, "
37793779
"checking if smaller large page sizes are usable",
3780-
byte_size_in_exact_unit(page_size),
3781-
exact_unit_for_byte_size(page_size));
3780+
EXACTFMTARGS(page_size));
37823781
for (size_t page_size_ = page_sizes.next_smaller(page_size);
37833782
page_size_ > os::vm_page_size();
37843783
page_size_ = page_sizes.next_smaller(page_size_)) {
@@ -3787,9 +3786,8 @@ static bool hugetlbfs_sanity_check(size_t page_size) {
37873786
if (p != MAP_FAILED) {
37883787
// Mapping succeeded, sanity check passed.
37893788
munmap(p, page_size_);
3790-
log_info(pagesize)("Large page size (%zu%s) passed sanity check",
3791-
byte_size_in_exact_unit(page_size_),
3792-
exact_unit_for_byte_size(page_size_));
3789+
log_info(pagesize)("Large page size (" EXACTFMT ") passed sanity check",
3790+
EXACTFMTARGS(page_size_));
37933791
return true;
37943792
}
37953793
}
@@ -3986,26 +3984,21 @@ void os::Linux::large_page_init() {
39863984
LargePageSizeInBytes == 0 ||
39873985
LargePageSizeInBytes == default_large_page_size) {
39883986
large_page_size = default_large_page_size;
3989-
log_info(pagesize)("Using the default large page size: %zu%s",
3990-
byte_size_in_exact_unit(large_page_size),
3991-
exact_unit_for_byte_size(large_page_size));
3987+
log_info(pagesize)("Using the default large page size: " EXACTFMT,
3988+
EXACTFMTARGS(large_page_size));
39923989
} else {
39933990
if (all_large_pages.contains(LargePageSizeInBytes)) {
39943991
large_page_size = LargePageSizeInBytes;
3995-
log_info(pagesize)("Overriding default large page size (%zu%s) "
3996-
"using LargePageSizeInBytes: %zu%s",
3997-
byte_size_in_exact_unit(default_large_page_size),
3998-
exact_unit_for_byte_size(default_large_page_size),
3999-
byte_size_in_exact_unit(large_page_size),
4000-
exact_unit_for_byte_size(large_page_size));
3992+
log_info(pagesize)("Overriding default large page size (" EXACTFMT ") "
3993+
"using LargePageSizeInBytes: " EXACTFMT,
3994+
EXACTFMTARGS(default_large_page_size),
3995+
EXACTFMTARGS(large_page_size));
40013996
} else {
40023997
large_page_size = default_large_page_size;
4003-
log_info(pagesize)("LargePageSizeInBytes is not a valid large page size (%zu%s) "
4004-
"using the default large page size: %zu%s",
4005-
byte_size_in_exact_unit(LargePageSizeInBytes),
4006-
exact_unit_for_byte_size(LargePageSizeInBytes),
4007-
byte_size_in_exact_unit(large_page_size),
4008-
exact_unit_for_byte_size(large_page_size));
3998+
log_info(pagesize)("LargePageSizeInBytes is not a valid large page size (" EXACTFMT ") "
3999+
"using the default large page size: " EXACTFMT,
4000+
EXACTFMTARGS(LargePageSizeInBytes),
4001+
EXACTFMTARGS(large_page_size));
40094002
}
40104003
}
40114004

@@ -4046,9 +4039,8 @@ static void log_on_commit_special_failure(char* req_addr, size_t bytes,
40464039
assert(error == ENOMEM, "Only expect to fail if no memory is available");
40474040

40484041
log_info(pagesize)("Failed to reserve and commit memory with given page size. req_addr: " PTR_FORMAT
4049-
" size: %zu%s, page size: %zu%s, (errno = %d)",
4050-
p2i(req_addr), byte_size_in_exact_unit(bytes), exact_unit_for_byte_size(bytes),
4051-
byte_size_in_exact_unit(page_size), exact_unit_for_byte_size(page_size), error);
4042+
" size: " EXACTFMT ", page size: " EXACTFMT ", (errno = %d)",
4043+
p2i(req_addr), EXACTFMTARGS(bytes), EXACTFMTARGS(page_size), error);
40524044
}
40534045

40544046
static bool commit_memory_special(size_t bytes,
@@ -4075,11 +4067,8 @@ static bool commit_memory_special(size_t bytes,
40754067
return false;
40764068
}
40774069

4078-
log_debug(pagesize)("Commit special mapping: " PTR_FORMAT ", size=%zu%s, page size=%zu%s",
4079-
p2i(addr), byte_size_in_exact_unit(bytes),
4080-
exact_unit_for_byte_size(bytes),
4081-
byte_size_in_exact_unit(page_size),
4082-
exact_unit_for_byte_size(page_size));
4070+
log_debug(pagesize)("Commit special mapping: " PTR_FORMAT ", size=" EXACTFMT ", page size=" EXACTFMT,
4071+
p2i(addr), EXACTFMTARGS(bytes), EXACTFMTARGS(page_size));
40834072
assert(is_aligned(addr, page_size), "Must be");
40844073
return true;
40854074
}

‎src/hotspot/os/windows/os_windows.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3409,8 +3409,8 @@ static char* find_aligned_address(size_t size, size_t alignment) {
34093409
}
34103410

34113411
static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec) {
3412-
log_debug(pagesize)("Reserving large pages at an aligned address, alignment=%zu%s",
3413-
byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
3412+
log_debug(pagesize)("Reserving large pages at an aligned address, alignment=" EXACTFMT,
3413+
EXACTFMTARGS(alignment));
34143414

34153415
// Will try to find a suitable address at most 20 times. The reason we need to try
34163416
// multiple times is that between finding the aligned address and trying to commit

‎src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
void EpsilonInitLogger::print_gc_specific() {
3434
if (UseTLAB) {
3535
size_t max_tlab = EpsilonHeap::heap()->max_tlab_size() * HeapWordSize;
36-
log_info(gc, init)("TLAB Size Max: %zu%s",
37-
byte_size_in_exact_unit(max_tlab), exact_unit_for_byte_size(max_tlab));
36+
log_info(gc, init)("TLAB Size Max: " EXACTFMT, EXACTFMTARGS(max_tlab));
3837
if (EpsilonElasticTLAB) {
3938
log_info(gc, init)("TLAB Size Elasticity: %.2fx", EpsilonTLABElasticity);
4039
}

‎src/hotspot/share/gc/parallel/parallelInitLogger.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
void ParallelInitLogger::print_heap() {
3030
log_info_p(gc, init)("Alignments:"
31-
" Space %zu%s,"
32-
" Generation %zu%s,"
33-
" Heap %zu%s",
34-
byte_size_in_exact_unit(SpaceAlignment), exact_unit_for_byte_size(SpaceAlignment),
35-
byte_size_in_exact_unit(GenAlignment), exact_unit_for_byte_size(GenAlignment),
36-
byte_size_in_exact_unit(HeapAlignment), exact_unit_for_byte_size(HeapAlignment));
31+
" Space " EXACTFMT ","
32+
" Generation " EXACTFMT ","
33+
" Heap " EXACTFMT,
34+
EXACTFMTARGS(SpaceAlignment),
35+
EXACTFMTARGS(GenAlignment),
36+
EXACTFMTARGS(HeapAlignment));
3737
GCInitLogger::print_heap();
3838
}
3939

‎src/hotspot/share/gc/shared/gcInitLogger.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,9 @@ void GCInitLogger::print_compressed_oops() {
9090
}
9191

9292
void GCInitLogger::print_heap() {
93-
log_info_p(gc, init)("Heap Min Capacity: %zu%s",
94-
byte_size_in_exact_unit(MinHeapSize), exact_unit_for_byte_size(MinHeapSize));
95-
log_info_p(gc, init)("Heap Initial Capacity: %zu%s",
96-
byte_size_in_exact_unit(InitialHeapSize), exact_unit_for_byte_size(InitialHeapSize));
97-
log_info_p(gc, init)("Heap Max Capacity: %zu%s",
98-
byte_size_in_exact_unit(MaxHeapSize), exact_unit_for_byte_size(MaxHeapSize));
93+
log_info_p(gc, init)("Heap Min Capacity: " EXACTFMT, EXACTFMTARGS(MinHeapSize));
94+
log_info_p(gc, init)("Heap Initial Capacity: " EXACTFMT, EXACTFMTARGS(InitialHeapSize));
95+
log_info_p(gc, init)("Heap Max Capacity: " EXACTFMT, EXACTFMTARGS(MaxHeapSize));
9996

10097
log_info_p(gc, init)("Pre-touch: %s", AlwaysPreTouch ? "Enabled" : "Disabled");
10198
}

‎src/hotspot/share/gc/z/zCollectedHeap.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,7 @@ void ZCollectedHeap::print_on_error(outputStream* st) const {
362362
st->print_cr("ZGC Globals:");
363363
st->print_cr(" Young Collection: %s/%u", ZGeneration::young()->phase_to_string(), ZGeneration::young()->seqnum());
364364
st->print_cr(" Old Collection: %s/%u", ZGeneration::old()->phase_to_string(), ZGeneration::old()->seqnum());
365-
st->print_cr(" Offset Max: %zu%s (" PTR_FORMAT ")",
366-
byte_size_in_exact_unit(ZAddressOffsetMax),
367-
exact_unit_for_byte_size(ZAddressOffsetMax),
368-
ZAddressOffsetMax);
365+
st->print_cr(" Offset Max: " EXACTFMT " (" PTR_FORMAT ")", EXACTFMTARGS(ZAddressOffsetMax), ZAddressOffsetMax);
369366
st->print_cr(" Page Size Small: %zuM", ZPageSizeSmall / M);
370367
st->print_cr(" Page Size Medium: %zuM", ZPageSizeMedium / M);
371368
st->cr();

‎src/hotspot/share/memory/memoryReserver.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ ReservedSpace MemoryReserver::reserve_memory_special(char* requested_address,
130130
size_t alignment,
131131
size_t page_size,
132132
bool exec) {
133-
log_trace(pagesize)("Attempt special mapping: size: %zu%s, alignment: %zu%s",
134-
byte_size_in_exact_unit(size), exact_unit_for_byte_size(size),
135-
byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
133+
log_trace(pagesize)("Attempt special mapping: size: " EXACTFMT ", alignment: " EXACTFMT,
134+
EXACTFMTARGS(size),
135+
EXACTFMTARGS(alignment));
136136

137137
char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec);
138138

‎src/hotspot/share/runtime/os.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,8 +1810,6 @@ int os::create_binary_file(const char* path, bool rewrite_existing) {
18101810
return ::open(path, oflags, S_IREAD | S_IWRITE);
18111811
}
18121812

1813-
#define trace_page_size_params(size) byte_size_in_exact_unit(size), exact_unit_for_byte_size(size)
1814-
18151813
void os::trace_page_sizes(const char* str,
18161814
const size_t region_min_size,
18171815
const size_t region_max_size,
@@ -1820,17 +1818,17 @@ void os::trace_page_sizes(const char* str,
18201818
const size_t page_size) {
18211819

18221820
log_info(pagesize)("%s: "
1823-
" min=%zu%s"
1824-
" max=%zu%s"
1821+
" min=" EXACTFMT
1822+
" max=" EXACTFMT
18251823
" base=" PTR_FORMAT
1826-
" size=%zu%s"
1827-
" page_size=%zu%s",
1824+
" size=" EXACTFMT
1825+
" page_size=" EXACTFMT,
18281826
str,
1829-
trace_page_size_params(region_min_size),
1830-
trace_page_size_params(region_max_size),
1827+
EXACTFMTARGS(region_min_size),
1828+
EXACTFMTARGS(region_max_size),
18311829
p2i(base),
1832-
trace_page_size_params(size),
1833-
trace_page_size_params(page_size));
1830+
EXACTFMTARGS(size),
1831+
EXACTFMTARGS(page_size));
18341832
}
18351833

18361834
void os::trace_page_sizes_for_requested_size(const char* str,
@@ -1841,17 +1839,17 @@ void os::trace_page_sizes_for_requested_size(const char* str,
18411839
const size_t page_size) {
18421840

18431841
log_info(pagesize)("%s:"
1844-
" req_size=%zu%s"
1845-
" req_page_size=%zu%s"
1842+
" req_size=" EXACTFMT
1843+
" req_page_size=" EXACTFMT
18461844
" base=" PTR_FORMAT
1847-
" size=%zu%s"
1848-
" page_size=%zu%s",
1845+
" size=" EXACTFMT
1846+
" page_size=" EXACTFMT,
18491847
str,
1850-
trace_page_size_params(requested_size),
1851-
trace_page_size_params(requested_page_size),
1848+
EXACTFMTARGS(requested_size),
1849+
EXACTFMTARGS(requested_page_size),
18521850
p2i(base),
1853-
trace_page_size_params(size),
1854-
trace_page_size_params(page_size));
1851+
EXACTFMTARGS(size),
1852+
EXACTFMTARGS(page_size));
18551853
}
18561854

18571855

0 commit comments

Comments
 (0)