|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
|
|
|
4ca1da |
@@ -977,7 +977,7 @@
|
|
|
4ca1da |
for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
|
|
|
4ca1da |
CodeSection* sect = code_section(n);
|
|
|
4ca1da |
if (!sect->is_allocated() || sect->is_empty()) continue;
|
|
|
4ca1da |
- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
|
|
|
4ca1da |
+ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
|
|
|
4ca1da |
n, sect->limit() - sect->start(), sect->limit() - sect->end());
|
|
|
4ca1da |
}
|
|
|
4ca1da |
xtty->print_cr("</blob>");
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp
|
|
|
4ca1da |
@@ -192,7 +192,7 @@
|
|
|
4ca1da |
}
|
|
|
4ca1da |
if (PrintCodeCacheExtension) {
|
|
|
4ca1da |
ResourceMark rm;
|
|
|
4ca1da |
- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
|
|
|
4ca1da |
+ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
|
|
|
4ca1da |
(intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
|
|
|
4ca1da |
(address)_heap->high() - (address)_heap->low_boundary());
|
|
|
4ca1da |
}
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
|
|
|
4ca1da |
@@ -598,7 +598,7 @@
|
|
|
4ca1da |
" [Table]\n"
|
|
|
4ca1da |
" [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
|
|
|
4ca1da |
" [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
|
|
|
4ca1da |
- " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
|
|
|
4ca1da |
+ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
|
|
|
4ca1da |
" [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
|
|
|
fad0a1 |
" [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: " UINT64_FORMAT "]\n"
|
|
|
4ca1da |
" [Age Threshold: " UINTX_FORMAT "]",
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
|
|
|
4ca1da |
@@ -57,7 +57,7 @@
|
|
|
4ca1da |
gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
|
|
|
4ca1da |
gclog_or_tty->print_cr(" "
|
|
|
4ca1da |
" rs.base(): " INTPTR_FORMAT
|
|
|
4ca1da |
- " rs.size(): " INTPTR_FORMAT
|
|
|
4ca1da |
+ " rs.size(): " SIZE_FORMAT
|
|
|
4ca1da |
" rs end(): " INTPTR_FORMAT,
|
|
|
4ca1da |
p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
|
|
|
4ca1da |
gclog_or_tty->print_cr(" "
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
|
|
|
4ca1da |
@@ -1055,7 +1055,8 @@
|
|
|
4ca1da |
size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
|
|
|
4ca1da |
assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
|
|
|
4ca1da |
assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
|
|
|
4ca1da |
- err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
|
|
|
4ca1da |
+ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
|
|
|
4ca1da |
+ expected, NewSize));
|
|
|
4ca1da |
}
|
|
|
4ca1da |
|
|
|
4ca1da |
private:
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
|
|
|
4ca1da |
@@ -1291,14 +1291,14 @@
|
|
|
4ca1da |
}
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Too early to use gclog_or_tty
|
|
|
4ca1da |
- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
|
|
|
4ca1da |
+ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
|
|
|
4ca1da |
// Code along this path potentially sets NewSize and OldSize
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Too early to use gclog_or_tty
|
|
|
4ca1da |
- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
|
|
|
4ca1da |
- " initial_heap_size: " SIZE_FORMAT
|
|
|
4ca1da |
+ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
|
|
|
4ca1da |
+ " initial_heap_size: " UINTX_FORMAT
|
|
|
4ca1da |
" max_heap: " SIZE_FORMAT,
|
|
|
4ca1da |
min_heap_size(), InitialHeapSize, max_heap);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
@@ -1314,7 +1314,7 @@
|
|
|
4ca1da |
FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize));
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Too early to use gclog_or_tty
|
|
|
4ca1da |
- tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
|
|
|
4ca1da |
+ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
}
|
|
|
4ca1da |
// Unless explicitly requested otherwise, size old gen
|
|
|
4ca1da |
@@ -1324,7 +1324,7 @@
|
|
|
4ca1da |
FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Too early to use gclog_or_tty
|
|
|
4ca1da |
- tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
|
|
|
4ca1da |
+ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
}
|
|
|
4ca1da |
}
|
|
|
4ca1da |
@@ -2043,7 +2043,7 @@
|
|
|
4ca1da |
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Cannot use gclog_or_tty yet.
|
|
|
4ca1da |
- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
|
|
|
4ca1da |
+ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
|
|
|
4ca1da |
}
|
|
|
4ca1da |
@@ -2053,7 +2053,7 @@
|
|
|
4ca1da |
set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
|
|
|
4ca1da |
if (PrintGCDetails && Verbose) {
|
|
|
4ca1da |
// Cannot use gclog_or_tty yet.
|
|
|
4ca1da |
- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size());
|
|
|
4ca1da |
+ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size());
|
|
|
4ca1da |
}
|
|
|
4ca1da |
}
|
|
|
4ca1da |
}
|
|
|
4ca1da |
diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
|
|
4ca1da |
--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
|
|
4ca1da |
+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
|
|
4ca1da |
@@ -1389,12 +1389,21 @@
|
|
|
4ca1da |
|
|
|
4ca1da |
#define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
|
|
|
4ca1da |
|
|
|
4ca1da |
+#if defined(S390) && !defined(_LP64)
|
|
|
4ca1da |
+#define SSIZE_FORMAT "%z" PRIdPTR
|
|
|
4ca1da |
+#define SIZE_FORMAT "%z" PRIuPTR
|
|
|
4ca1da |
+#define SIZE_FORMAT_HEX "0x%z" PRIxPTR
|
|
|
4ca1da |
+#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR
|
|
|
4ca1da |
+#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR
|
|
|
4ca1da |
+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
|
|
|
4ca1da |
+#else // !S390
|
|
|
4ca1da |
#define SSIZE_FORMAT "%" PRIdPTR
|
|
|
4ca1da |
#define SIZE_FORMAT "%" PRIuPTR
|
|
|
4ca1da |
#define SIZE_FORMAT_HEX "0x%" PRIxPTR
|
|
|
4ca1da |
#define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
|
|
|
4ca1da |
#define SIZE_FORMAT_W(width) "%" #width PRIuPTR
|
|
|
4ca1da |
#define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
|
|
|
4ca1da |
+#endif // S390
|
|
|
4ca1da |
|
|
|
4ca1da |
#define INTX_FORMAT "%" PRIdPTR
|
|
|
4ca1da |
#define UINTX_FORMAT "%" PRIuPTR
|
|
|
2b8175 |
diff --git openjdk.orig/hotspot/src/share/vm/runtime/memprofiler.cpp openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp
|
|
|
2b8175 |
--- openjdk.orig/hotspot/src/share/vm/runtime/memprofiler.cpp
|
|
|
2b8175 |
+++ openjdk/hotspot/src/share/vm/runtime/memprofiler.cpp
|
|
|
2b8175 |
@@ -117,16 +117,16 @@
|
|
|
2b8175 |
}
|
|
|
2b8175 |
|
|
|
2b8175 |
// Print trace line in log
|
|
|
2b8175 |
- fprintf(_log_fp, "%6.1f,%5d,%5d," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) ",",
|
|
|
2b8175 |
+ fprintf(_log_fp, "%6.1f,%5d,%5d," SIZE_FORMAT_W(6) "," SIZE_FORMAT_W(6) ",",
|
|
|
2b8175 |
os::elapsedTime(),
|
|
|
2b8175 |
Threads::number_of_threads(),
|
|
|
2b8175 |
SystemDictionary::number_of_classes(),
|
|
|
2b8175 |
Universe::heap()->used() / K,
|
|
|
2b8175 |
Universe::heap()->capacity() / K);
|
|
|
2b8175 |
|
|
|
2b8175 |
- fprintf(_log_fp, UINTX_FORMAT_W(6) ",", CodeCache::capacity() / K);
|
|
|
2b8175 |
+ fprintf(_log_fp, SIZE_FORMAT_W(6) ",", CodeCache::capacity() / K);
|
|
|
2b8175 |
|
|
|
2b8175 |
- fprintf(_log_fp, UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) "," UINTX_FORMAT_W(6) "\n",
|
|
|
2b8175 |
+ fprintf(_log_fp, SIZE_FORMAT_W(6) "," SIZE_FORMAT_W(6) "," SIZE_FORMAT_W(6) "\n",
|
|
|
2b8175 |
handles_memory_usage / K,
|
|
|
2b8175 |
resource_memory_usage / K,
|
|
|
2b8175 |
OopMapCache::memory_usage() / K);
|