Skip to content

Commit b4cd3b1

Browse files
coleenpcoleenp
committedJan 14, 2025
8347566: Replace SSIZE_FORMAT with 'z' length modifier
Reviewed-by: dlong, dholmes, kbarrett
1 parent f0af830 commit b4cd3b1

File tree

7 files changed

+78
-79
lines changed

7 files changed

+78
-79
lines changed
 

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -2306,14 +2306,14 @@ bool os::Linux::query_process_memory_info(os::Linux::meminfo_t* info) {
23062306
info->rssanon = info->rssfile = info->rssshmem = -1;
23072307
if (f != nullptr) {
23082308
while (::fgets(buf, sizeof(buf), f) != nullptr && num_found < num_values) {
2309-
if ( (info->vmsize == -1 && sscanf(buf, "VmSize: " SSIZE_FORMAT " kB", &info->vmsize) == 1) ||
2310-
(info->vmpeak == -1 && sscanf(buf, "VmPeak: " SSIZE_FORMAT " kB", &info->vmpeak) == 1) ||
2311-
(info->vmswap == -1 && sscanf(buf, "VmSwap: " SSIZE_FORMAT " kB", &info->vmswap) == 1) ||
2312-
(info->vmhwm == -1 && sscanf(buf, "VmHWM: " SSIZE_FORMAT " kB", &info->vmhwm) == 1) ||
2313-
(info->vmrss == -1 && sscanf(buf, "VmRSS: " SSIZE_FORMAT " kB", &info->vmrss) == 1) ||
2314-
(info->rssanon == -1 && sscanf(buf, "RssAnon: " SSIZE_FORMAT " kB", &info->rssanon) == 1) || // Needs Linux 4.5
2315-
(info->rssfile == -1 && sscanf(buf, "RssFile: " SSIZE_FORMAT " kB", &info->rssfile) == 1) || // Needs Linux 4.5
2316-
(info->rssshmem == -1 && sscanf(buf, "RssShmem: " SSIZE_FORMAT " kB", &info->rssshmem) == 1) // Needs Linux 4.5
2309+
if ( (info->vmsize == -1 && sscanf(buf, "VmSize: %zd kB", &info->vmsize) == 1) ||
2310+
(info->vmpeak == -1 && sscanf(buf, "VmPeak: %zd kB", &info->vmpeak) == 1) ||
2311+
(info->vmswap == -1 && sscanf(buf, "VmSwap: %zd kB", &info->vmswap) == 1) ||
2312+
(info->vmhwm == -1 && sscanf(buf, "VmHWM: %zd kB", &info->vmhwm) == 1) ||
2313+
(info->vmrss == -1 && sscanf(buf, "VmRSS: %zd kB", &info->vmrss) == 1) ||
2314+
(info->rssanon == -1 && sscanf(buf, "RssAnon: %zd kB", &info->rssanon) == 1) || // Needs Linux 4.5
2315+
(info->rssfile == -1 && sscanf(buf, "RssFile: %zd kB", &info->rssfile) == 1) || // Needs Linux 4.5
2316+
(info->rssshmem == -1 && sscanf(buf, "RssShmem: %zd kB", &info->rssshmem) == 1) // Needs Linux 4.5
23172317
)
23182318
{
23192319
num_found ++;
@@ -2361,15 +2361,15 @@ void os::Linux::print_process_memory_info(outputStream* st) {
23612361
// rss its components if the kernel is recent enough.
23622362
meminfo_t info;
23632363
if (query_process_memory_info(&info)) {
2364-
st->print_cr("Virtual Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", info.vmsize, info.vmpeak);
2365-
st->print("Resident Set Size: " SSIZE_FORMAT "K (peak: " SSIZE_FORMAT "K)", info.vmrss, info.vmhwm);
2364+
st->print_cr("Virtual Size: %zdK (peak: %zdK)", info.vmsize, info.vmpeak);
2365+
st->print("Resident Set Size: %zdK (peak: %zdK)", info.vmrss, info.vmhwm);
23662366
if (info.rssanon != -1) { // requires kernel >= 4.5
2367-
st->print(" (anon: " SSIZE_FORMAT "K, file: " SSIZE_FORMAT "K, shmem: " SSIZE_FORMAT "K)",
2367+
st->print(" (anon: %zdK, file: %zdK, shmem: %zdK)",
23682368
info.rssanon, info.rssfile, info.rssshmem);
23692369
}
23702370
st->cr();
23712371
if (info.vmswap != -1) { // requires kernel >= 2.6.34
2372-
st->print_cr("Swapped out: " SSIZE_FORMAT "K", info.vmswap);
2372+
st->print_cr("Swapped out: %zdK", info.vmswap);
23732373
}
23742374
} else {
23752375
st->print_cr("Could not open /proc/self/status to get process memory related information");

‎src/hotspot/share/code/codeCache.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ CodeBlob* CodeCache::allocate(uint size, CodeBlobType code_blob_type, bool handl
565565
} else {
566566
tty->print("CodeCache");
567567
}
568-
tty->print_cr(" extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
568+
tty->print_cr(" extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (%zd bytes)",
569569
(intptr_t)heap->low_boundary(), (intptr_t)heap->high(),
570570
(address)heap->high() - (address)heap->low_boundary());
571571
}
@@ -1491,10 +1491,10 @@ void CodeCache::print_memory_overhead() {
14911491
}
14921492
// Print bytes that are allocated in the freelist
14931493
ttyLocker ttl;
1494-
tty->print_cr("Number of elements in freelist: " SSIZE_FORMAT, freelists_length());
1495-
tty->print_cr("Allocated in freelist: " SSIZE_FORMAT "kB", bytes_allocated_in_freelists()/K);
1496-
tty->print_cr("Unused bytes in CodeBlobs: " SSIZE_FORMAT "kB", (wasted_bytes/K));
1497-
tty->print_cr("Segment map size: " SSIZE_FORMAT "kB", allocated_segments()/K); // 1 byte per segment
1494+
tty->print_cr("Number of elements in freelist: %zd", freelists_length());
1495+
tty->print_cr("Allocated in freelist: %zdkB", bytes_allocated_in_freelists()/K);
1496+
tty->print_cr("Unused bytes in CodeBlobs: %zdkB", (wasted_bytes/K));
1497+
tty->print_cr("Segment map size: %zdkB", allocated_segments()/K); // 1 byte per segment
14981498
}
14991499

15001500
//------------------------------------------------------------------------------------------------

‎src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp

+42-41
Large diffs are not rendered by default.

‎src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -95,7 +96,7 @@ size_t ShenandoahSimpleBitMap::count_trailing_ones(idx_t last_idx) const {
9596

9697
bool ShenandoahSimpleBitMap::is_forward_consecutive_ones(idx_t start_idx, idx_t count) const {
9798
while (count > 0) {
98-
assert((start_idx >= 0) && (start_idx < _num_bits), "precondition: start_idx: " SSIZE_FORMAT ", count: " SSIZE_FORMAT,
99+
assert((start_idx >= 0) && (start_idx < _num_bits), "precondition: start_idx: %zd, count: %zd",
99100
start_idx, count);
100101
assert(start_idx + count <= (idx_t) _num_bits, "precondition");
101102
size_t array_idx = start_idx >> LogBitsPerWord;

‎src/hotspot/share/nmt/memReporter.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -554,7 +554,7 @@ void MemSummaryDiffReporter::print_malloc_diff(size_t current_amount, size_t cur
554554
out->print(" #" SIZE_FORMAT "", current_count);
555555
const ssize_t delta_count = counter_diff(current_count, early_count);
556556
if (delta_count != 0) {
557-
out->print(" " SSIZE_PLUS_FORMAT, delta_count);
557+
out->print(" %+zd", delta_count);
558558
}
559559
}
560560
}
@@ -572,7 +572,7 @@ void MemSummaryDiffReporter::print_arena_diff(size_t current_amount, size_t curr
572572
out->print(" #" SIZE_FORMAT "", current_count);
573573
const ssize_t delta_count = counter_diff(current_count, early_count);
574574
if (delta_count != 0) {
575-
out->print(" " SSIZE_PLUS_FORMAT, delta_count);
575+
out->print(" %+zd", delta_count);
576576
}
577577
}
578578

@@ -650,21 +650,21 @@ void MemSummaryDiffReporter::diff_summary_of_type(MemTag mem_tag,
650650
const ssize_t class_count_diff =
651651
counter_diff(_current_baseline.class_count(), _early_baseline.class_count());
652652
if (class_count_diff != 0) {
653-
out->print(" " SSIZE_PLUS_FORMAT, class_count_diff);
653+
out->print(" %+zd", class_count_diff);
654654
}
655655
out->print_cr(")");
656656

657657
out->print("( instance classes #" SIZE_FORMAT, _current_baseline.instance_class_count());
658658
const ssize_t instance_class_count_diff =
659659
counter_diff(_current_baseline.instance_class_count(), _early_baseline.instance_class_count());
660660
if (instance_class_count_diff != 0) {
661-
out->print(" " SSIZE_PLUS_FORMAT, instance_class_count_diff);
661+
out->print(" %+zd", instance_class_count_diff);
662662
}
663663
out->print(", array classes #" SIZE_FORMAT, _current_baseline.array_class_count());
664664
const ssize_t array_class_count_diff =
665665
counter_diff(_current_baseline.array_class_count(), _early_baseline.array_class_count());
666666
if (array_class_count_diff != 0) {
667-
out->print(" " SSIZE_PLUS_FORMAT, array_class_count_diff);
667+
out->print(" %+zd", array_class_count_diff);
668668
}
669669
out->print_cr(")");
670670

@@ -673,7 +673,7 @@ void MemSummaryDiffReporter::diff_summary_of_type(MemTag mem_tag,
673673
out->print("(threads #" SIZE_FORMAT, _current_baseline.thread_count());
674674
const ssize_t thread_count_diff = counter_diff(_current_baseline.thread_count(), _early_baseline.thread_count());
675675
if (thread_count_diff != 0) {
676-
out->print(" " SSIZE_PLUS_FORMAT, thread_count_diff);
676+
out->print(" %+zd", thread_count_diff);
677677
}
678678
out->print_cr(")");
679679

‎src/hotspot/share/utilities/globalDefinitions.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ class oopDesc;
136136
#define UINT64_FORMAT_0 "%016" PRIx64
137137

138138
// Format integers which change size between 32- and 64-bit.
139-
#define SSIZE_FORMAT "%" PRIdPTR
140-
#define SSIZE_PLUS_FORMAT "%+" PRIdPTR
141-
#define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
142139
#define SIZE_FORMAT "%" PRIuPTR
143140
#define SIZE_FORMAT_X "0x%" PRIxPTR
144141
#ifdef _LP64

‎test/hotspot/gtest/utilities/test_globalDefinitions.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,16 @@ TEST(globalDefinitions, format_specifiers) {
261261
check_format(UINT64_FORMAT_W(5), (uint64_t)123, " 123");
262262
check_format(UINT64_FORMAT_W(-5), (uint64_t)123, "123 ");
263263

264-
check_format(SSIZE_FORMAT, (ssize_t)123, "123");
265-
check_format(SSIZE_FORMAT, (ssize_t)-123, "-123");
266-
check_format(SSIZE_FORMAT, (ssize_t)2147483647, "2147483647");
267-
check_format(SSIZE_FORMAT, (ssize_t)-2147483647, "-2147483647");
268-
check_format(SSIZE_PLUS_FORMAT, (ssize_t)123, "+123");
269-
check_format(SSIZE_PLUS_FORMAT, (ssize_t)-123, "-123");
270-
check_format(SSIZE_PLUS_FORMAT, (ssize_t)2147483647, "+2147483647");
271-
check_format(SSIZE_PLUS_FORMAT, (ssize_t)-2147483647, "-2147483647");
272-
check_format(SSIZE_FORMAT_W(5), (ssize_t)123, " 123");
273-
check_format(SSIZE_FORMAT_W(-5), (ssize_t)123, "123 ");
264+
check_format("%zd", (ssize_t)123, "123");
265+
check_format("%zd", (ssize_t)-123, "-123");
266+
check_format("%zd", (ssize_t)2147483647, "2147483647");
267+
check_format("%zd", (ssize_t)-2147483647, "-2147483647");
268+
check_format("%+zd", (ssize_t)123, "+123");
269+
check_format("%+zd", (ssize_t)-123, "-123");
270+
check_format("%+zd", (ssize_t)2147483647, "+2147483647");
271+
check_format("%+zd", (ssize_t)-2147483647, "-2147483647");
272+
check_format("%5zd", (ssize_t)123, " 123");
273+
check_format("%-5zd", (ssize_t)123, "123 ");
274274
check_format(SIZE_FORMAT, (size_t)123u, "123");
275275
check_format(SIZE_FORMAT_X, (size_t)0x123u, "0x123");
276276
check_format(SIZE_FORMAT_X_0, (size_t)0x123u, "0x" LP64_ONLY("00000000") "00000123");

0 commit comments

Comments
 (0)
Please sign in to comment.