Skip to content

Commit 4f50316

Browse files
committed
8292680: Convert Dictionary to ConcurrentHashTable
Reviewed-by: rehn, hseigel
1 parent 2fe0ce0 commit 4f50316

30 files changed

+436
-356
lines changed

src/hotspot/share/ci/ciEnv.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ ciInstance* ciEnv::get_or_create_exception(jobject& handle, Symbol* name) {
376376
VM_ENTRY_MARK;
377377
if (handle == NULL) {
378378
// Cf. universe.cpp, creation of Universe::_null_ptr_exception_instance.
379-
InstanceKlass* ik = SystemDictionary::find_instance_klass(name, Handle(), Handle());
379+
InstanceKlass* ik = SystemDictionary::find_instance_klass(THREAD, name, Handle(), Handle());
380380
jobject objh = NULL;
381381
if (ik != NULL) {
382382
oop obj = ik->allocate_instance(THREAD);
@@ -529,7 +529,7 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass,
529529
if (!require_local) {
530530
kls = SystemDictionary::find_constrained_instance_or_array_klass(current, sym, loader);
531531
} else {
532-
kls = SystemDictionary::find_instance_or_array_klass(sym, loader, domain);
532+
kls = SystemDictionary::find_instance_or_array_klass(current, sym, loader, domain);
533533
}
534534
found_klass = kls;
535535
}

src/hotspot/share/classfile/classLoaderDataGraph.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -572,18 +572,6 @@ void ClassLoaderDataGraph::purge(bool at_safepoint) {
572572
}
573573
}
574574

575-
int ClassLoaderDataGraph::resize_dictionaries() {
576-
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
577-
int resized = 0;
578-
assert (Dictionary::does_any_dictionary_needs_resizing(), "some dictionary should need resizing");
579-
FOR_ALL_DICTIONARY(cld) {
580-
if (cld->dictionary()->resize_if_needed()) {
581-
resized++;
582-
}
583-
}
584-
return resized;
585-
}
586-
587575
ClassLoaderDataGraphKlassIteratorAtomic::ClassLoaderDataGraphKlassIteratorAtomic()
588576
: _next_klass(NULL) {
589577
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");

src/hotspot/share/classfile/classLoaderDataGraph.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ class ClassLoaderDataGraph : public AllStatic {
104104
static void print_dictionary(outputStream* st);
105105
static void print_table_statistics(outputStream* st);
106106

107-
static int resize_dictionaries();
108-
109107
static bool has_metaspace_oom() { return _metaspace_oom; }
110108
static void set_metaspace_oom(bool value) { _metaspace_oom = value; }
111109

0 commit comments

Comments
 (0)