archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8213563: appcds/sharedStrings/SharedStringsStress.java fails with 'GC triggered before VM initialization completed' error

Browse source 
Move MetaspaceShared::read_extra_data() call to the main MetaspaceShared::preload_and_dump() operation.

Reviewed-by: iklam
This commit is contained in:
Jiangli Zhou 2018-11-13 15:11:53 -05:00
parent 0050cd5776
commit beb5b05d44
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/share/memory/metaspaceShared.cpp
View file

@ -338,12 +338,6 @@ void MetaspaceShared::post_initialize(TRAPS) {
ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index); 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) { 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); 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); HeapShared::init_subgraph_entry_fields(THREAD);
// Rewrite and link classes // Rewrite and link classes