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

8268778: CDS check_excluded_classes needs DumpTimeTable_lock

Browse source 
Reviewed-by: ccheung, minqi
This commit is contained in:
Ioi Lam 2021-06-16 16:05:19 +00:00
parent 72b3b0af08
commit e4908a439a
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/cds/dynamicArchive.cpp
View file

@ -107,9 +107,11 @@ public:
verify_universe("Before CDS dynamic dump");
DEBUG_ONLY(SystemDictionaryShared::NoClassLoadingMark nclm);
// Block concurrent class unloading from changing the _dumptime_table
MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
SystemDictionaryShared::check_excluded_classes();
MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
init_header();
gather_source_objs();
reserve_buffer();

6
src/hotspot/share/cds/metaspaceShared.cpp
View file

@ -484,12 +484,10 @@ void VM_PopulateDumpSharedSpace::doit() {
NOT_PRODUCT(SystemDictionary::verify();)
// At this point, many classes have been loaded.
// Gather systemDictionary classes in a global array and do everything to
// that so we don't have to walk the SystemDictionary again.
// Block concurrent class unloading from changing the _dumptime_table
MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
SystemDictionaryShared::check_excluded_classes();
MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
StaticArchiveBuilder builder;
builder.gather_source_objs();
builder.reserve_buffer();

2
src/hotspot/share/classfile/systemDictionaryShared.cpp
View file

@ -1485,6 +1485,8 @@ public:
};
void SystemDictionaryShared::check_excluded_classes() {
assert(no_class_loading_should_happen(), "sanity");
assert_lock_strong(DumpTimeTable_lock);
ExcludeDumpTimeSharedClasses excl;
_dumptime_table->iterate(&excl);
_dumptime_table->update_counts();