archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8231610: Relocate the CDS archive if it cannot be mapped to the requested address

Browse source 
Reviewed-by: jiangli, coleenp, ccheung
This commit is contained in:
Ioi Lam 2019-11-13 16:36:54 -08:00
parent cdba535853
commit 5678f98a9e
36 changed files with 1880 additions and 717 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@
#include "classfile/vmSymbols.hpp"
#include "logging/log.hpp"
#include "memory/allocation.hpp"
#include "memory/archiveUtils.hpp"
#include "memory/filemap.hpp"
#include "memory/metadataFactory.hpp"
#include "memory/metaspaceClosure.hpp"
@ -294,6 +295,7 @@ public:
if (DynamicDumpSharedSpaces) {
_klass = DynamicArchive::original_to_target(info._klass);
}
ArchivePtrMarker::mark_pointer(&_klass);
}
bool matches(int clsfile_size, int clsfile_crc32) const {
@ -337,6 +339,8 @@ public:
} else {
*info_pointer_addr(klass) = record;
}
ArchivePtrMarker::mark_pointer(info_pointer_addr(klass));
}
// Used by RunTimeSharedDictionary to implement OffsetCompactHashtable::EQUALS
@ -1354,7 +1358,7 @@ public:
if (DynamicDumpSharedSpaces) {
name = DynamicArchive::original_to_target(name);
}
hash = primitive_hash<Symbol*>(name);
hash = SystemDictionaryShared::hash_for_shared_dictionary(name);
u4 delta;
if (DynamicDumpSharedSpaces) {
delta = MetaspaceShared::object_delta_u4(DynamicArchive::buffer_to_target(record));
@ -1413,7 +1417,7 @@ SystemDictionaryShared::find_record(RunTimeSharedDictionary* static_dict, RunTim
return NULL;
}
unsigned int hash = primitive_hash<Symbol*>(name);
unsigned int hash = SystemDictionaryShared::hash_for_shared_dictionary(name);
const RunTimeSharedClassInfo* record = NULL;
if (!MetaspaceShared::is_shared_dynamic(name)) {
// The names of all shared classes in the static dict must also be in the