From beb5b05d4428a6868f6a3c88a8fa46233d646e25 Mon Sep 17 00:00:00 2001 From: Jiangli Zhou Date: Tue, 13 Nov 2018 15:11:53 -0500 Subject: [PATCH] 8213563: appcds/sharedStrings/SharedStringsStress.java fails with 'GC triggered before VM initialization completed' error Move MetaspaceShared::read_extra_data() call to the main MetaspaceShared::preload_and_dump() operation. Reviewed-by: iklam --- src/hotspot/share/memory/metaspaceShared.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp index 34e0eafa477..a59a9205d25 100644 --- a/src/hotspot/share/memory/metaspaceShared.cpp +++ b/src/hotspot/share/memory/metaspaceShared.cpp @@ -338,12 +338,6 @@ void MetaspaceShared::post_initialize(TRAPS) { ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index); } } - - if (DumpSharedSpaces) { - if (SharedArchiveConfigFile) { - read_extra_data(SharedArchiveConfigFile, THREAD); - } - } } void MetaspaceShared::read_extra_data(const char* filename, TRAPS) { @@ -1705,6 +1699,12 @@ void MetaspaceShared::preload_and_dump(TRAPS) { log_info(cds)("Shared spaces: preloaded %d classes", class_count); + if (SharedArchiveConfigFile) { + tty->print_cr("Reading extra data from %s ...", SharedArchiveConfigFile); + read_extra_data(SharedArchiveConfigFile, THREAD); + } + tty->print_cr("Reading extra data: done."); + HeapShared::init_subgraph_entry_fields(THREAD); // Rewrite and link classes