diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp index d80383be2720d..9b5fb2b7f1d75 100644 --- a/src/hotspot/share/cds/aotMetaspace.cpp +++ b/src/hotspot/share/cds/aotMetaspace.cpp @@ -1974,13 +1974,13 @@ void AOTMetaspace::unmap_archive(FileMapInfo* mapinfo) { // For -XX:PrintSharedArchiveAndExit class CountSharedSymbols : public SymbolClosure { private: - int _count; + size_t _count; public: CountSharedSymbols() : _count(0) {} void do_symbol(Symbol** sym) { _count++; } - int total() { return _count; } + size_t total() { return _count; } }; @@ -2054,7 +2054,7 @@ void AOTMetaspace::initialize_shared_spaces() { // collect shared symbols and strings CountSharedSymbols cl; SymbolTable::shared_symbols_do(&cl); - tty->print_cr("Number of shared symbols: %d", cl.total()); + tty->print_cr("Number of shared symbols: %zu", cl.total()); tty->print_cr("Number of shared strings: %zu", StringTable::shared_entry_count()); tty->print_cr("VM version: %s\r\n", static_mapinfo->vm_version()); if (FileMapInfo::current_info() == nullptr || _archive_loading_failed) { diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp index be4238810088f..79d894f01441c 100644 --- a/src/hotspot/share/cds/archiveUtils.hpp +++ b/src/hotspot/share/cds/archiveUtils.hpp @@ -324,14 +324,14 @@ class HeapRootSegments { size_t _base_offset; size_t _count; int _roots_count; - int _max_size_in_bytes; + size_t _max_size_in_bytes; int _max_size_in_elems; public: size_t base_offset() { return _base_offset; } size_t count() { return _count; } int roots_count() { return _roots_count; } - int max_size_in_bytes() { return _max_size_in_bytes; } + size_t max_size_in_bytes() { return _max_size_in_bytes; } int max_size_in_elems() { return _max_size_in_elems; } size_t size_in_bytes(size_t seg_idx); diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp index 3f72a7c68729f..1f346283664ea 100644 --- a/src/hotspot/share/cds/cdsHeapVerifier.cpp +++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp @@ -158,7 +158,7 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0) CDSHeapVerifier::~CDSHeapVerifier() { if (_problems > 0) { - log_error(aot, heap)("Scanned %d objects. Found %d case(s) where " + log_error(aot, heap)("Scanned %zu objects. Found %d case(s) where " "an object points to a static field that " "may hold a different value at runtime.", _archived_objs, _problems); log_error(aot, heap)("Please see cdsHeapVerifier.cpp and aotClassInitializer.cpp for details"); diff --git a/src/hotspot/share/cds/cdsHeapVerifier.hpp b/src/hotspot/share/cds/cdsHeapVerifier.hpp index 1cc03975c5cda..fdcc2e72303f2 100644 --- a/src/hotspot/share/cds/cdsHeapVerifier.hpp +++ b/src/hotspot/share/cds/cdsHeapVerifier.hpp @@ -40,7 +40,7 @@ class CDSHeapVerifier : public KlassClosure { class CheckStaticFields; class TraceFields; - int _archived_objs; + size_t _archived_objs; int _problems; struct StaticFieldInfo { diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 8c2175622e92f..c0f1b05272741 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -310,7 +310,7 @@ void FileMapHeader::print(outputStream* st) { st->print_cr("- heap_root_segments.base_offset: 0x%zx", _heap_root_segments.base_offset()); st->print_cr("- heap_root_segments.count: %zu", _heap_root_segments.count()); st->print_cr("- heap_root_segments.max_size_elems: %d", _heap_root_segments.max_size_in_elems()); - st->print_cr("- heap_root_segments.max_size_bytes: %d", _heap_root_segments.max_size_in_bytes()); + st->print_cr("- heap_root_segments.max_size_bytes: %zu", _heap_root_segments.max_size_in_bytes()); st->print_cr("- _heap_oopmap_start_pos: %zu", _heap_oopmap_start_pos); st->print_cr("- _heap_ptrmap_start_pos: %zu", _heap_ptrmap_start_pos); st->print_cr("- _rw_ptrmap_start_pos: %zu", _rw_ptrmap_start_pos); diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp index de4d1c8a72947..91afa8c615d75 100644 --- a/src/hotspot/share/cds/heapShared.cpp +++ b/src/hotspot/share/cds/heapShared.cpp @@ -1049,7 +1049,7 @@ void HeapShared::write_subgraph_info_table() { _run_time_subgraph_info_table.reset(); - CompactHashtableWriter writer(d_table->_count, &stats); + CompactHashtableWriter writer(d_table->number_of_entries(), &stats); CopyKlassSubGraphInfoToArchive copy(&writer); d_table->iterate(©); writer.dump(&_run_time_subgraph_info_table, "subgraphs"); @@ -1819,15 +1819,15 @@ void HeapShared::check_special_subgraph_classes() { HeapShared::SeenObjectsTable* HeapShared::_seen_objects_table = nullptr; HeapShared::PendingOop HeapShared::_object_being_archived; -int HeapShared::_num_new_walked_objs; -int HeapShared::_num_new_archived_objs; -int HeapShared::_num_old_recorded_klasses; +size_t HeapShared::_num_new_walked_objs; +size_t HeapShared::_num_new_archived_objs; +size_t HeapShared::_num_old_recorded_klasses; -int HeapShared::_num_total_subgraph_recordings = 0; -int HeapShared::_num_total_walked_objs = 0; -int HeapShared::_num_total_archived_objs = 0; -int HeapShared::_num_total_recorded_klasses = 0; -int HeapShared::_num_total_verifications = 0; +size_t HeapShared::_num_total_subgraph_recordings = 0; +size_t HeapShared::_num_total_walked_objs = 0; +size_t HeapShared::_num_total_archived_objs = 0; +size_t HeapShared::_num_total_recorded_klasses = 0; +size_t HeapShared::_num_total_verifications = 0; bool HeapShared::has_been_seen_during_subgraph_recording(oop obj) { return _seen_objects_table->get(obj) != nullptr; @@ -1850,10 +1850,10 @@ void HeapShared::start_recording_subgraph(InstanceKlass *k, const char* class_na } void HeapShared::done_recording_subgraph(InstanceKlass *k, const char* class_name) { - int num_new_recorded_klasses = get_subgraph_info(k)->num_subgraph_object_klasses() - + size_t num_new_recorded_klasses = get_subgraph_info(k)->num_subgraph_object_klasses() - _num_old_recorded_klasses; log_info(aot, heap)("Done recording subgraph(s) for archived fields in %s: " - "walked %d objs, archived %d new objs, recorded %d classes", + "walked %zu objs, archived %zu new objs, recorded %zu classes", class_name, _num_new_walked_objs, _num_new_archived_objs, num_new_recorded_klasses); @@ -2101,18 +2101,18 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[], done_recording_subgraph(info->klass, klass_name); } - log_info(aot, heap)("Archived subgraph records = %d", + log_info(aot, heap)("Archived subgraph records = %zu", _num_total_subgraph_recordings); - log_info(aot, heap)(" Walked %d objects", _num_total_walked_objs); - log_info(aot, heap)(" Archived %d objects", _num_total_archived_objs); - log_info(aot, heap)(" Recorded %d klasses", _num_total_recorded_klasses); + log_info(aot, heap)(" Walked %zu objects", _num_total_walked_objs); + log_info(aot, heap)(" Archived %zu objects", _num_total_archived_objs); + log_info(aot, heap)(" Recorded %zu klasses", _num_total_recorded_klasses); #ifndef PRODUCT for (int i = 0; fields[i].valid(); i++) { ArchivableStaticFieldInfo* f = &fields[i]; verify_subgraph_from_static_field(f->klass, f->offset); } - log_info(aot, heap)(" Verified %d references", _num_total_verifications); + log_info(aot, heap)(" Verified %zu references", _num_total_verifications); #endif } @@ -2164,8 +2164,8 @@ void HeapShared::debug_trace() { class FindEmbeddedNonNullPointers: public BasicOopIterateClosure { void* _start; BitMap *_oopmap; - int _num_total_oops; - int _num_null_oops; + size_t _num_total_oops; + size_t _num_null_oops; public: FindEmbeddedNonNullPointers(void* start, BitMap* oopmap) : _start(start), _oopmap(oopmap), _num_total_oops(0), _num_null_oops(0) {} @@ -2191,8 +2191,8 @@ class FindEmbeddedNonNullPointers: public BasicOopIterateClosure { _num_null_oops ++; } } - int num_total_oops() const { return _num_total_oops; } - int num_null_oops() const { return _num_null_oops; } + size_t num_total_oops() const { return _num_total_oops; } + size_t num_null_oops() const { return _num_null_oops; } }; #endif diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp index c877748fe9c56..cc41fb1dec721 100644 --- a/src/hotspot/share/cds/heapShared.hpp +++ b/src/hotspot/share/cds/heapShared.hpp @@ -217,10 +217,7 @@ class HeapShared: AllStatic { 137, // prime number AnyObj::C_HEAP, mtClassShared, - DumpTimeSharedClassTable_hash> { - public: - int _count; - }; + DumpTimeSharedClassTable_hash> {}; public: // solaris compiler wants this for RunTimeKlassSubGraphInfoTable inline static bool record_equals_compact_hashtable_entry( @@ -301,16 +298,16 @@ class HeapShared: AllStatic { } // Statistics (for one round of start_recording_subgraph ... done_recording_subgraph) - static int _num_new_walked_objs; - static int _num_new_archived_objs; - static int _num_old_recorded_klasses; + static size_t _num_new_walked_objs; + static size_t _num_new_archived_objs; + static size_t _num_old_recorded_klasses; // Statistics (for all archived subgraphs) - static int _num_total_subgraph_recordings; - static int _num_total_walked_objs; - static int _num_total_archived_objs; - static int _num_total_recorded_klasses; - static int _num_total_verifications; + static size_t _num_total_subgraph_recordings; + static size_t _num_total_walked_objs; + static size_t _num_total_archived_objs; + static size_t _num_total_recorded_klasses; + static size_t _num_total_verifications; static void start_recording_subgraph(InstanceKlass *k, const char* klass_name, bool is_full_module_graph);