8347990: Remove SIZE_FORMAT macros and replace remaining uses

Reviewed-by: dholmes, kbarrett

Author: coleenp

src/hotspot/share/memory/metaspace.cpp

@@ -216,7 +216,7 @@ void MetaspaceUtils::print_on(outputStream* out) {
   // Used from all GCs. It first prints out totals, then, separately, the class space portion.
   MetaspaceCombinedStats stats = get_combined_statistics();
   out->print_cr(" Metaspace       "
-                "used "      SIZE_FORMAT "K, "
+                "used %zuK, "
                 "committed %zuK, "
                 "reserved %zuK",
                 stats.used()/K,
@@ -225,7 +225,7 @@ void MetaspaceUtils::print_on(outputStream* out) {
 
   if (Metaspace::using_class_space()) {
     out->print_cr("  class space    "
-                  "used "      SIZE_FORMAT "K, "
+                  "used %zuK, "
                   "committed %zuK, "
                   "reserved %zuK",
                   stats.class_space_stats().used()/K,
@@ -565,7 +565,7 @@ void Metaspace::initialize_class_space(ReservedSpace rs) {
          "%zu != %zu", rs.size(), CompressedClassSpaceSize);
   assert(using_class_space(), "Must be using class space");
 
-  assert(rs.size() == CompressedClassSpaceSize, SIZE_FORMAT " != %zu",
+  assert(rs.size() == CompressedClassSpaceSize, "%zu != %zu",
          rs.size(), CompressedClassSpaceSize);
   assert(is_aligned(rs.base(), Metaspace::reserve_alignment()) &&
          is_aligned(rs.size(), Metaspace::reserve_alignment()),

src/hotspot/share/utilities/globalDefinitions.hpp

@@ -134,12 +134,6 @@ class oopDesc;
 #define UINT64_FORMAT_W(width)   "%"   #width PRIu64
 #define UINT64_FORMAT_0          "%016"       PRIx64
 
-
-// Format integers which change size between 32- and 64-bit.
-#define SIZE_FORMAT              "%"          PRIuPTR
-#define SIZE_FORMAT_X            "0x%"        PRIxPTR
-#define SIZE_FORMAT_W(width)     "%"   #width PRIuPTR
-
 // Format jlong, if necessary
 #ifndef JLONG_FORMAT
 #define JLONG_FORMAT             INT64_FORMAT
@@ -373,15 +367,15 @@ inline T byte_size_in_proper_unit(T s) {
   }
 }
 
-#define PROPERFMT             SIZE_FORMAT "%s"
+#define PROPERFMT             "%zu%s"
 #define PROPERFMTARGS(s)      byte_size_in_proper_unit(s), proper_unit_for_byte_size(s)
 
 // Printing a range, with start and bytes given
-#define RANGEFMT              "[" PTR_FORMAT " - " PTR_FORMAT "), (" SIZE_FORMAT " bytes)"
+#define RANGEFMT              "[" PTR_FORMAT " - " PTR_FORMAT "), (%zu bytes)"
 #define RANGEFMTARGS(p1, size) p2i(p1), p2i(p1 + size), size
 
 // Printing a range, with start and end given
-#define RANGE2FMT             "[" PTR_FORMAT " - " PTR_FORMAT "), (" SIZE_FORMAT " bytes)"
+#define RANGE2FMT             "[" PTR_FORMAT " - " PTR_FORMAT "), (%zu bytes)"
 #define RANGE2FMTARGS(p1, p2) p2i(p1), p2i(p2), ((uintptr_t)p2 - (uintptr_t)p1)
 
 inline const char* exact_unit_for_byte_size(size_t s) {
@@ -414,12 +408,12 @@ inline size_t byte_size_in_exact_unit(size_t s) {
   return s;
 }
 
-#define EXACTFMT            SIZE_FORMAT "%s"
+#define EXACTFMT            "%zu%s"
 #define EXACTFMTARGS(s)     byte_size_in_exact_unit(s), exact_unit_for_byte_size(s)
 
 // Memory size transition formatting.
 
-#define HEAP_CHANGE_FORMAT "%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)->" SIZE_FORMAT "K(" SIZE_FORMAT "K)"
+#define HEAP_CHANGE_FORMAT "%s: %zuK(%zuK)->%zuK(%zuK)"
 
 #define HEAP_CHANGE_FORMAT_ARGS(_name_, _prev_used_, _prev_capacity_, _used_, _capacity_) \
   (_name_), (_prev_used_) / K, (_prev_capacity_) / K, (_used_) / K, (_capacity_) / K

test/hotspot/gtest/gc/g1/test_g1FreeIdSet.cpp

@@ -112,7 +112,7 @@ class TestG1FreeIdSetThread : public JavaTestThread {
       ++_allocations;
       ThreadBlockInVM tbiv(this); // Safepoint check.
     }
-    tty->print_cr("%u allocations: " SIZE_FORMAT, _thread_number, _allocations);
+    tty->print_cr("%u allocations: %zu", _thread_number, _allocations);
     Atomic::add(_total_allocations, _allocations);
   }
 };
@@ -150,7 +150,7 @@ TEST_VM(G1FreeIdSetTest, stress) {
     ThreadInVMfromNative invm(this_thread);
     post.wait_with_safepoint_check(this_thread);
   }
-  tty->print_cr("total allocations: " SIZE_FORMAT, total_allocations);
+  tty->print_cr("total allocations: %zu", total_allocations);
   tty->print_cr("final free list: ");
   uint ids[size] = {};
   for (uint i = 0; i < size; ++i) {

test/hotspot/gtest/gc/shared/test_bufferNodeAllocator.cpp

@@ -141,7 +141,7 @@ class BufferNode::TestSupport::AllocatorThread : public JavaTestThread {
       ++_allocations;
       ThreadBlockInVM tbiv(this); // Safepoint check.
     }
-    tty->print_cr("allocations: " SIZE_FORMAT, _allocations);
+    tty->print_cr("allocations: %zu", _allocations);
     Atomic::add(_total_allocations, _allocations);
   }
 };
@@ -233,8 +233,8 @@ static void run_test(BufferNode::Allocator* allocator, CompletedList* cbl) {
     post.wait_with_safepoint_check(this_thread);
   }
   ASSERT_TRUE(BufferNode::TestSupport::try_transfer_pending(allocator));
-  tty->print_cr("total allocations: " SIZE_FORMAT, total_allocations);
-  tty->print_cr("allocator free count: " SIZE_FORMAT, allocator->free_count());
+  tty->print_cr("total allocations: %zu", total_allocations);
+  tty->print_cr("allocator free count: %zu", allocator->free_count());
 }
 
 TEST_VM(BufferNodeAllocatorTest, stress_free_list_allocator) {

test/hotspot/gtest/gc/shared/test_oopStorage.cpp

@@ -1135,9 +1135,9 @@ TEST_VM_F(OopStorageTestWithAllocation, print_storage) {
   {
     ResourceMark rm;
     stringStream expected_st;
-    expected_st.print("Test Storage: " SIZE_FORMAT
-                      " entries in " SIZE_FORMAT
-                      " blocks (%.F%%), " SIZE_FORMAT " bytes",
+    expected_st.print("Test Storage: %zu"
+                      " entries in %zu"
+                      " blocks (%.F%%), %zu bytes",
                       expected_entries,
                       expected_blocks,
                       expected_usage,

test/hotspot/gtest/gc/shared/test_workerDataArray.cpp

@@ -88,10 +88,10 @@ const char* WorkerDataArrayTest<size_t>::format_summary(
   size_t min, double avg, size_t max, size_t diff, size_t sum, size_t workers) {
 
   stringStream out;
-  out.print(" Min: " SIZE_FORMAT
-            ", Avg: %4.1lf, Max: " SIZE_FORMAT
-            ", Diff: " SIZE_FORMAT ", Sum: " SIZE_FORMAT
-            ", Workers: " SIZE_FORMAT "\n",
+  out.print(" Min: %zu"
+            ", Avg: %4.1lf, Max: %zu"
+            ", Diff: %zu, Sum: %zu"
+            ", Workers: %zu\n",
             min, avg, max, diff, sum, workers);
   return out.as_string();
 }
@@ -104,7 +104,7 @@ const char* WorkerDataArrayTest<double>::format_summary(
   out.print(" Min: %4.2lf"
             ", Avg: %4.2lf, Max: %4.2lf"
             ", Diff: %4.2lf, Sum: %4.2lf"
-            ", Workers: " SIZE_FORMAT "\n",
+            ", Workers: %zu\n",
             min, avg, max, diff, sum, workers);
   return out.as_string();
 }

test/hotspot/gtest/logging/test_logFileOutput.cpp

@@ -89,7 +89,7 @@ TEST_VM(LogFileOutput, parse_invalid) {
 // Test for overflows with filesize
 TEST_VM(LogFileOutput, filesize_overflow) {
   char buf[256];
-  int ret = jio_snprintf(buf, sizeof(buf), "filesize=" SIZE_FORMAT "K", SIZE_MAX);
+  int ret = jio_snprintf(buf, sizeof(buf), "filesize=%zuK", SIZE_MAX);
   ASSERT_GT(ret, 0) << "Buffer too small";
 
   ResourceMark rm;
@@ -107,7 +107,7 @@ TEST_VM(LogFileOutput, startup_rotation) {
   for (size_t i = 0; i < rotations; i++) {
     size_t len = strlen(filename) + 3;
     rotated_file[i] = NEW_RESOURCE_ARRAY(char, len);
-    int ret = jio_snprintf(rotated_file[i], len, "%s." SIZE_FORMAT, filename, i);
+    int ret = jio_snprintf(rotated_file[i], len, "%s.%zu", filename, i);
     ASSERT_NE(-1, ret);
     delete_file(rotated_file[i]);
   }

test/hotspot/gtest/logging/test_logMessageTest.cpp

@@ -167,14 +167,14 @@ TEST_VM_F(LogMessageTest, message_with_many_lines) {
 
   LogMessageBuffer msg;
   for (size_t i = 0; i < lines; i++) {
-    msg.info("Line #" SIZE_FORMAT, i);
+    msg.info("Line #%zu", i);
   }
   _log.write(msg);
 
   char expected_lines_data[lines][line_length];
   const char* expected_lines[lines + 1];
   for (size_t i = 0; i < lines; i++) {
-    jio_snprintf(&expected_lines_data[i][0], line_length, "Line #" SIZE_FORMAT, i);
+    jio_snprintf(&expected_lines_data[i][0], line_length, "Line #%zu", i);
     expected_lines[i] = expected_lines_data[i];
   }
   expected_lines[lines] = nullptr;

test/hotspot/gtest/memory/test_arena.cpp

@@ -248,7 +248,7 @@ TEST_VM(Arena, random_allocs) {
       p = ar.AmallocWords(size);
       alignment = BytesPerWord;
     }
-    LOG(("[%d]: " PTR_FORMAT ", size " SIZE_FORMAT ", aligned " SIZE_FORMAT,
+    LOG(("[%d]: " PTR_FORMAT ", size %zu, aligned %zu",
          i, p2i(p), size, alignment));
     ASSERT_NOT_NULL(p);
     ASSERT_ALIGN(p, alignment);
@@ -279,7 +279,7 @@ TEST_VM(Arena, random_allocs) {
       ASSERT_NULL(p2);
     }
     ptrs[i] = p2; sizes[i] = new_size;
-    LOG(("[%d]: realloc " PTR_FORMAT ", size " SIZE_FORMAT ", aligned " SIZE_FORMAT,
+    LOG(("[%d]: realloc " PTR_FORMAT ", size %zu, aligned %zu",
          i, p2i(p2), new_size, alignments[i]));
   }
 

test/hotspot/gtest/metaspace/test_blocktree.cpp

@@ -143,7 +143,7 @@ static void test_find_nearest_fit_with_tree(const size_t sizes[], size_t request
     EXPECT_0(real_size);
   }
 
-  LOG(SIZE_FORMAT ": " SIZE_FORMAT ".", request_size, real_size);
+  LOG(SIZE_FORMAT ": %zu.", request_size, real_size);
 
 }
 
@@ -397,13 +397,13 @@ class BlockTreeTest {
 
     feed_all(feeding_pattern);
 
-    LOG("Blocks in circulation: bt1=%d:" SIZE_FORMAT ", bt2=%d:" SIZE_FORMAT ".",
+    LOG("Blocks in circulation: bt1=%d:%zu, bt2=%d:%zu.",
         _bt[0].count(), _bt[0].total_size(),
         _bt[1].count(), _bt[1].total_size());
 
     ping_pong_loop(5000);
 
-    LOG("After Pingpong: bt1=%d:" SIZE_FORMAT ", bt2=%d:" SIZE_FORMAT ".",
+    LOG("After Pingpong: bt1=%d:%zu, bt2=%d:%zu.",
         _bt[0].count(), _bt[0].total_size(),
         _bt[1].count(), _bt[1].total_size());