archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +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

14
src/hotspot/share/oops/method.cpp
View file

@ -332,18 +332,21 @@ int Method::size(bool is_native) {
return align_metadata_size(header_size() + extra_words);
}
Symbol* Method::klass_name() const {
return method_holder()->name();
}
void Method::metaspace_pointers_do(MetaspaceClosure* it) {
log_trace(cds)("Iter(Method): %p", this);
it->push(&_constMethod);
it->push(&_method_data);
it->push(&_method_counters);
Method* this_ptr = this;
it->push_method_entry(&this_ptr, (intptr_t*)&_i2i_entry);
it->push_method_entry(&this_ptr, (intptr_t*)&_from_compiled_entry);
it->push_method_entry(&this_ptr, (intptr_t*)&_from_interpreted_entry);
}
// Attempt to return method oop to original state. Clear any pointers
@ -1741,12 +1744,15 @@ static int method_comparator(Method* a, Method* b) {
// This is only done during class loading, so it is OK to assume method_idnum matches the methods() array
// default_methods also uses this without the ordering for fast find_method
void Method::sort_methods(Array<Method*>* methods, bool set_idnums) {
void Method::sort_methods(Array<Method*>* methods, bool set_idnums, method_comparator_func func) {
int length = methods->length();
if (length > 1) {
if (func == NULL) {
func = method_comparator;
}
{
NoSafepointVerifier nsv;
QuickSort::sort(methods->data(), length, method_comparator, /*idempotent=*/false);
QuickSort::sort(methods->data(), length, func, /*idempotent=*/false);
}
// Reset method ordering
if (set_idnums) {