Mercurial > hg > truffle
annotate src/share/vm/classfile/dictionary.cpp @ 20350:c3990b8c710e hs25.40-b07
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
Summary: Because anonymous classes are not in the system dictionary, we have to set 'unloading_occurred' based on 'CLDG::do_unloading()'. Added jtreg test.
Reviewed-by: kvn, coleenp
| author | thartmann |
|---|---|
| date | Mon, 25 Aug 2014 08:20:17 +0200 |
| parents | 2c6ef90f030a |
| children | 6e0cb14ce59b |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
17674
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
12840
diff
changeset
|
2 * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1513
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1513
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1513
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "classfile/dictionary.hpp" | |
| 27 #include "classfile/systemDictionary.hpp" | |
| 12837 | 28 #include "memory/iterator.hpp" |
| 1972 | 29 #include "oops/oop.inline.hpp" |
| 30 #include "prims/jvmtiRedefineClassesTrace.hpp" | |
|
20197
ce8f6bb717c9
8042195: Introduce umbrella header orderAccess.inline.hpp.
goetz
parents:
17937
diff
changeset
|
31 #include "runtime/orderAccess.inline.hpp" |
| 1972 | 32 #include "utilities/hashtable.inline.hpp" |
| 0 | 33 |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17674
diff
changeset
|
34 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
| 0 | 35 |
| 36 DictionaryEntry* Dictionary::_current_class_entry = NULL; | |
| 37 int Dictionary::_current_class_index = 0; | |
| 38 | |
| 39 | |
| 40 Dictionary::Dictionary(int table_size) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
41 : TwoOopHashtable<Klass*, mtClass>(table_size, sizeof(DictionaryEntry)) { |
| 0 | 42 _current_class_index = 0; |
| 43 _current_class_entry = NULL; | |
| 12837 | 44 _pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize); |
| 0 | 45 }; |
| 46 | |
| 47 | |
| 6197 | 48 Dictionary::Dictionary(int table_size, HashtableBucket<mtClass>* t, |
| 0 | 49 int number_of_entries) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
50 : TwoOopHashtable<Klass*, mtClass>(table_size, sizeof(DictionaryEntry), t, number_of_entries) { |
| 0 | 51 _current_class_index = 0; |
| 52 _current_class_entry = NULL; | |
| 12837 | 53 _pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize); |
| 0 | 54 }; |
| 55 | |
| 12837 | 56 ProtectionDomainCacheEntry* Dictionary::cache_get(oop protection_domain) { |
| 57 return _pd_cache_table->get(protection_domain); | |
| 58 } | |
| 0 | 59 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
60 DictionaryEntry* Dictionary::new_entry(unsigned int hash, Klass* klass, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
61 ClassLoaderData* loader_data) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
62 DictionaryEntry* entry = (DictionaryEntry*)Hashtable<Klass*, mtClass>::new_entry(hash, klass); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
63 entry->set_loader_data(loader_data); |
| 0 | 64 entry->set_pd_set(NULL); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
65 assert(klass->oop_is_instance(), "Must be"); |
| 0 | 66 return entry; |
| 67 } | |
| 68 | |
| 69 | |
| 70 void Dictionary::free_entry(DictionaryEntry* entry) { | |
| 71 // avoid recursion when deleting linked list | |
| 72 while (entry->pd_set() != NULL) { | |
| 73 ProtectionDomainEntry* to_delete = entry->pd_set(); | |
| 74 entry->set_pd_set(to_delete->next()); | |
| 75 delete to_delete; | |
| 76 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
77 Hashtable<Klass*, mtClass>::free_entry(entry); |
| 0 | 78 } |
| 79 | |
| 80 | |
| 81 bool DictionaryEntry::contains_protection_domain(oop protection_domain) const { | |
| 82 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
83 if (protection_domain == InstanceKlass::cast(klass())->protection_domain()) { |
| 0 | 84 // Ensure this doesn't show up in the pd_set (invariant) |
| 85 bool in_pd_set = false; | |
| 86 for (ProtectionDomainEntry* current = _pd_set; | |
| 87 current != NULL; | |
| 88 current = current->next()) { | |
| 89 if (current->protection_domain() == protection_domain) { | |
| 90 in_pd_set = true; | |
| 91 break; | |
| 92 } | |
| 93 } | |
| 94 if (in_pd_set) { | |
| 95 assert(false, "A klass's protection domain should not show up " | |
| 96 "in its sys. dict. PD set"); | |
| 97 } | |
| 98 } | |
| 99 #endif /* ASSERT */ | |
| 100 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
101 if (protection_domain == InstanceKlass::cast(klass())->protection_domain()) { |
| 0 | 102 // Succeeds trivially |
| 103 return true; | |
| 104 } | |
| 105 | |
| 106 for (ProtectionDomainEntry* current = _pd_set; | |
| 107 current != NULL; | |
| 108 current = current->next()) { | |
| 109 if (current->protection_domain() == protection_domain) return true; | |
| 110 } | |
| 111 return false; | |
| 112 } | |
| 113 | |
| 114 | |
| 12837 | 115 void DictionaryEntry::add_protection_domain(Dictionary* dict, oop protection_domain) { |
| 0 | 116 assert_locked_or_safepoint(SystemDictionary_lock); |
| 117 if (!contains_protection_domain(protection_domain)) { | |
| 12837 | 118 ProtectionDomainCacheEntry* entry = dict->cache_get(protection_domain); |
| 0 | 119 ProtectionDomainEntry* new_head = |
| 12837 | 120 new ProtectionDomainEntry(entry, _pd_set); |
| 0 | 121 // Warning: Preserve store ordering. The SystemDictionary is read |
| 122 // without locks. The new ProtectionDomainEntry must be | |
| 123 // complete before other threads can be allowed to see it | |
| 124 // via a store to _pd_set. | |
| 125 OrderAccess::release_store_ptr(&_pd_set, new_head); | |
| 126 } | |
| 127 if (TraceProtectionDomainVerification && WizardMode) { | |
| 128 print(); | |
| 129 } | |
| 130 } | |
| 131 | |
| 132 | |
|
20350
c3990b8c710e
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
20278
diff
changeset
|
133 void Dictionary::do_unloading() { |
|
1489
cff162798819
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
710
diff
changeset
|
134 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
| 0 | 135 |
| 136 // Remove unloadable entries and classes from system dictionary | |
| 137 // The placeholder array has been handled in always_strong_oops_do. | |
| 138 DictionaryEntry* probe = NULL; | |
|
20350
c3990b8c710e
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
20278
diff
changeset
|
139 for (int index = 0; index < table_size(); index++) { |
| 0 | 140 for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
| 141 probe = *p; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
142 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
143 ClassLoaderData* loader_data = probe->loader_data(); |
| 0 | 144 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
145 InstanceKlass* ik = InstanceKlass::cast(e); |
| 0 | 146 |
| 147 // Non-unloadable classes were handled in always_strong_oops_do | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
148 if (!is_strongly_reachable(loader_data, e)) { |
| 0 | 149 // Entry was not visited in phase1 (negated test from phase1) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
150 assert(!loader_data->is_the_null_class_loader_data(), "unloading entry with null class loader"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
151 ClassLoaderData* k_def_class_loader_data = ik->class_loader_data(); |
| 0 | 152 |
| 153 // Do we need to delete this system dictionary entry? | |
| 154 bool purge_entry = false; | |
| 155 | |
| 156 // Do we need to delete this system dictionary entry? | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
157 if (loader_data->is_unloading()) { |
| 0 | 158 // If the loader is not live this entry should always be |
|
20350
c3990b8c710e
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
20278
diff
changeset
|
159 // removed (will never be looked up again). |
| 0 | 160 purge_entry = true; |
| 161 } else { | |
| 162 // The loader in this entry is alive. If the klass is dead, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
163 // (determined by checking the defining class loader) |
| 0 | 164 // the loader must be an initiating loader (rather than the |
| 165 // defining loader). Remove this entry. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
166 if (k_def_class_loader_data->is_unloading()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
167 // If we get here, the class_loader_data must not be the defining |
| 0 | 168 // loader, it must be an initiating one. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
169 assert(k_def_class_loader_data != loader_data, |
| 0 | 170 "cannot have live defining loader and unreachable klass"); |
| 171 // Loader is live, but class and its defining loader are dead. | |
| 172 // Remove the entry. The class is going away. | |
| 173 purge_entry = true; | |
| 174 } | |
| 175 } | |
| 176 | |
| 177 if (purge_entry) { | |
| 178 *p = probe->next(); | |
| 179 if (probe == _current_class_entry) { | |
| 180 _current_class_entry = NULL; | |
| 181 } | |
| 182 free_entry(probe); | |
| 183 continue; | |
| 184 } | |
| 185 } | |
| 186 p = probe->next_addr(); | |
| 187 } | |
| 188 } | |
| 189 } | |
| 190 | |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
191 void Dictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
192 // Skip the strong roots probe marking if the closures are the same. |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
193 if (strong == weak) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
194 oops_do(strong); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
195 return; |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
196 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
197 |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
198 for (int index = 0; index < table_size(); index++) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
199 for (DictionaryEntry *probe = bucket(index); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
200 probe != NULL; |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
201 probe = probe->next()) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
202 Klass* e = probe->klass(); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
203 ClassLoaderData* loader_data = probe->loader_data(); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
204 if (is_strongly_reachable(loader_data, e)) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
205 probe->set_strongly_reachable(); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
206 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
207 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
208 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
209 _pd_cache_table->roots_oops_do(strong, weak); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
210 } |
| 0 | 211 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
212 void Dictionary::always_strong_oops_do(OopClosure* blk) { |
| 12837 | 213 // Follow all system classes and temporary placeholders in dictionary; only |
| 214 // protection domain oops contain references into the heap. In a first | |
| 215 // pass over the system dictionary determine which need to be treated as | |
| 216 // strongly reachable and mark them as such. | |
| 0 | 217 for (int index = 0; index < table_size(); index++) { |
| 218 for (DictionaryEntry *probe = bucket(index); | |
| 219 probe != NULL; | |
| 220 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
221 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
222 ClassLoaderData* loader_data = probe->loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
223 if (is_strongly_reachable(loader_data, e)) { |
| 12837 | 224 probe->set_strongly_reachable(); |
| 0 | 225 } |
| 226 } | |
| 227 } | |
| 12837 | 228 // Then iterate over the protection domain cache to apply the closure on the |
| 229 // previously marked ones. | |
| 230 _pd_cache_table->always_strong_oops_do(blk); | |
| 0 | 231 } |
| 232 | |
| 233 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
234 void Dictionary::always_strong_classes_do(KlassClosure* closure) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
235 // Follow all system classes and temporary placeholders in dictionary |
| 0 | 236 for (int index = 0; index < table_size(); index++) { |
| 237 for (DictionaryEntry* probe = bucket(index); | |
| 238 probe != NULL; | |
| 239 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
240 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
241 ClassLoaderData* loader_data = probe->loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
242 if (is_strongly_reachable(loader_data, e)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
243 closure->do_klass(e); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
244 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
245 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
246 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
247 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
248 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
249 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
250 // Just the classes from defining class loaders |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
251 void Dictionary::classes_do(void f(Klass*)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
252 for (int index = 0; index < table_size(); index++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
253 for (DictionaryEntry* probe = bucket(index); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
254 probe != NULL; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
255 probe = probe->next()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
256 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
257 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 258 f(k); |
| 259 } | |
| 260 } | |
| 261 } | |
| 262 } | |
| 263 | |
| 264 // Added for initialize_itable_for_klass to handle exceptions | |
| 265 // Just the classes from defining class loaders | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
266 void Dictionary::classes_do(void f(Klass*, TRAPS), TRAPS) { |
| 0 | 267 for (int index = 0; index < table_size(); index++) { |
| 268 for (DictionaryEntry* probe = bucket(index); | |
| 269 probe != NULL; | |
| 270 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
271 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
272 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 273 f(k, CHECK); |
| 274 } | |
| 275 } | |
| 276 } | |
| 277 } | |
| 278 | |
| 279 // All classes, and their class loaders | |
| 280 // Don't iterate over placeholders | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
281 void Dictionary::classes_do(void f(Klass*, ClassLoaderData*)) { |
| 0 | 282 for (int index = 0; index < table_size(); index++) { |
| 283 for (DictionaryEntry* probe = bucket(index); | |
| 284 probe != NULL; | |
| 285 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
286 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
287 f(k, probe->loader_data()); |
| 0 | 288 } |
| 289 } | |
| 290 } | |
| 291 | |
| 292 void Dictionary::oops_do(OopClosure* f) { | |
| 12837 | 293 // Only the protection domain oops contain references into the heap. Iterate |
| 294 // over all of them. | |
| 295 _pd_cache_table->oops_do(f); | |
| 0 | 296 } |
| 297 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
298 void Dictionary::methods_do(void f(Method*)) { |
| 0 | 299 for (int index = 0; index < table_size(); index++) { |
| 300 for (DictionaryEntry* probe = bucket(index); | |
| 301 probe != NULL; | |
| 302 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
303 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
304 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 305 // only take klass is we have the entry with the defining class loader |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
306 InstanceKlass::cast(k)->methods_do(f); |
| 0 | 307 } |
| 308 } | |
| 309 } | |
| 310 } | |
| 311 | |
| 12837 | 312 void Dictionary::unlink(BoolObjectClosure* is_alive) { |
| 313 // Only the protection domain cache table may contain references to the heap | |
| 314 // that need to be unlinked. | |
| 315 _pd_cache_table->unlink(is_alive); | |
| 316 } | |
| 0 | 317 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
318 Klass* Dictionary::try_get_next_class() { |
| 0 | 319 while (true) { |
| 320 if (_current_class_entry != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
321 Klass* k = _current_class_entry->klass(); |
| 0 | 322 _current_class_entry = _current_class_entry->next(); |
| 323 return k; | |
| 324 } | |
| 325 _current_class_index = (_current_class_index + 1) % table_size(); | |
| 326 _current_class_entry = bucket(_current_class_index); | |
| 327 } | |
| 328 // never reached | |
| 329 } | |
| 330 | |
| 331 // Add a loaded class to the system dictionary. | |
| 332 // Readers of the SystemDictionary aren't always locked, so _buckets | |
| 333 // is volatile. The store of the next field in the constructor is | |
| 334 // also cast to volatile; we do this to ensure store order is maintained | |
| 335 // by the compilers. | |
| 336 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
337 void Dictionary::add_klass(Symbol* class_name, ClassLoaderData* loader_data, |
| 0 | 338 KlassHandle obj) { |
| 339 assert_locked_or_safepoint(SystemDictionary_lock); | |
| 340 assert(obj() != NULL, "adding NULL obj"); | |
| 6983 | 341 assert(obj()->name() == class_name, "sanity check on name"); |
|
8667
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7185
diff
changeset
|
342 assert(loader_data != NULL, "Must be non-NULL"); |
| 0 | 343 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
344 unsigned int hash = compute_hash(class_name, loader_data); |
| 0 | 345 int index = hash_to_index(hash); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
346 DictionaryEntry* entry = new_entry(hash, obj(), loader_data); |
| 0 | 347 add_entry(index, entry); |
| 348 } | |
| 349 | |
| 350 | |
| 351 // This routine does not lock the system dictionary. | |
| 352 // | |
| 353 // Since readers don't hold a lock, we must make sure that system | |
| 354 // dictionary entries are only removed at a safepoint (when only one | |
| 355 // thread is running), and are added to in a safe way (all links must | |
| 356 // be updated in an MT-safe manner). | |
| 357 // | |
| 358 // Callers should be aware that an entry could be added just after | |
| 359 // _buckets[index] is read here, so the caller will not see the new entry. | |
| 360 DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
361 Symbol* class_name, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
362 ClassLoaderData* loader_data) { |
| 0 | 363 debug_only(_lookup_count++); |
| 364 for (DictionaryEntry* entry = bucket(index); | |
| 365 entry != NULL; | |
| 366 entry = entry->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
367 if (entry->hash() == hash && entry->equals(class_name, loader_data)) { |
| 0 | 368 return entry; |
| 369 } | |
| 370 debug_only(_lookup_length++); | |
| 371 } | |
| 372 return NULL; | |
| 373 } | |
| 374 | |
| 375 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
376 Klass* Dictionary::find(int index, unsigned int hash, Symbol* name, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
377 ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
378 DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
| 0 | 379 if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { |
| 380 return entry->klass(); | |
| 381 } else { | |
| 382 return NULL; | |
| 383 } | |
| 384 } | |
| 385 | |
| 386 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
387 Klass* Dictionary::find_class(int index, unsigned int hash, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
388 Symbol* name, ClassLoaderData* loader_data) { |
| 0 | 389 assert_locked_or_safepoint(SystemDictionary_lock); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
390 assert (index == index_for(name, loader_data), "incorrect index?"); |
| 0 | 391 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
392 DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
393 return (entry != NULL) ? entry->klass() : (Klass*)NULL; |
| 0 | 394 } |
| 395 | |
| 396 | |
| 397 // Variant of find_class for shared classes. No locking required, as | |
| 398 // that table is static. | |
| 399 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
400 Klass* Dictionary::find_shared_class(int index, unsigned int hash, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
401 Symbol* name) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
402 assert (index == index_for(name, NULL), "incorrect index?"); |
| 0 | 403 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
404 DictionaryEntry* entry = get_entry(index, hash, name, NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
405 return (entry != NULL) ? entry->klass() : (Klass*)NULL; |
| 0 | 406 } |
| 407 | |
| 408 | |
| 409 void Dictionary::add_protection_domain(int index, unsigned int hash, | |
| 410 instanceKlassHandle klass, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
411 ClassLoaderData* loader_data, Handle protection_domain, |
| 0 | 412 TRAPS) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
413 Symbol* klass_name = klass->name(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
414 DictionaryEntry* entry = get_entry(index, hash, klass_name, loader_data); |
| 0 | 415 |
| 416 assert(entry != NULL,"entry must be present, we just created it"); | |
| 417 assert(protection_domain() != NULL, | |
| 418 "real protection domain should be present"); | |
| 419 | |
| 12837 | 420 entry->add_protection_domain(this, protection_domain()); |
| 0 | 421 |
| 422 assert(entry->contains_protection_domain(protection_domain()), | |
| 423 "now protection domain should be present"); | |
| 424 } | |
| 425 | |
| 426 | |
| 427 bool Dictionary::is_valid_protection_domain(int index, unsigned int hash, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
428 Symbol* name, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
429 ClassLoaderData* loader_data, |
| 0 | 430 Handle protection_domain) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
431 DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
| 0 | 432 return entry->is_valid_protection_domain(protection_domain); |
| 433 } | |
| 434 | |
| 435 | |
| 436 void Dictionary::reorder_dictionary() { | |
| 437 | |
| 438 // Copy all the dictionary entries into a single master list. | |
| 439 | |
| 440 DictionaryEntry* master_list = NULL; | |
| 441 for (int i = 0; i < table_size(); ++i) { | |
| 442 DictionaryEntry* p = bucket(i); | |
| 443 while (p != NULL) { | |
| 444 DictionaryEntry* tmp; | |
| 445 tmp = p->next(); | |
| 446 p->set_next(master_list); | |
| 447 master_list = p; | |
| 448 p = tmp; | |
| 449 } | |
| 450 set_entry(i, NULL); | |
| 451 } | |
| 452 | |
| 453 // Add the dictionary entries back to the list in the correct buckets. | |
| 454 while (master_list != NULL) { | |
| 455 DictionaryEntry* p = master_list; | |
| 456 master_list = master_list->next(); | |
| 457 p->set_next(NULL); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
458 Symbol* class_name = InstanceKlass::cast((Klass*)(p->klass()))->name(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
459 // Since the null class loader data isn't copied to the CDS archive, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
460 // compute the hash with NULL for loader data. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
461 unsigned int hash = compute_hash(class_name, NULL); |
| 0 | 462 int index = hash_to_index(hash); |
| 463 p->set_hash(hash); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
464 p->set_loader_data(NULL); // loader_data isn't copied to CDS |
| 0 | 465 p->set_next(bucket(index)); |
| 466 set_entry(index, p); | |
| 467 } | |
| 468 } | |
| 469 | |
| 12837 | 470 ProtectionDomainCacheTable::ProtectionDomainCacheTable(int table_size) |
| 471 : Hashtable<oop, mtClass>(table_size, sizeof(ProtectionDomainCacheEntry)) | |
| 472 { | |
| 473 } | |
| 474 | |
| 475 void ProtectionDomainCacheTable::unlink(BoolObjectClosure* is_alive) { | |
| 476 assert(SafepointSynchronize::is_at_safepoint(), "must be"); | |
| 477 for (int i = 0; i < table_size(); ++i) { | |
| 478 ProtectionDomainCacheEntry** p = bucket_addr(i); | |
| 479 ProtectionDomainCacheEntry* entry = bucket(i); | |
| 480 while (entry != NULL) { | |
| 481 if (is_alive->do_object_b(entry->literal())) { | |
| 482 p = entry->next_addr(); | |
| 483 } else { | |
| 484 *p = entry->next(); | |
| 485 free_entry(entry); | |
| 486 } | |
| 487 entry = *p; | |
| 488 } | |
| 489 } | |
| 490 } | |
| 491 | |
| 492 void ProtectionDomainCacheTable::oops_do(OopClosure* f) { | |
| 493 for (int index = 0; index < table_size(); index++) { | |
| 494 for (ProtectionDomainCacheEntry* probe = bucket(index); | |
| 495 probe != NULL; | |
| 496 probe = probe->next()) { | |
| 497 probe->oops_do(f); | |
| 498 } | |
| 499 } | |
| 500 } | |
| 501 | |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
502 void ProtectionDomainCacheTable::roots_oops_do(OopClosure* strong, OopClosure* weak) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
503 for (int index = 0; index < table_size(); index++) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
504 for (ProtectionDomainCacheEntry* probe = bucket(index); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
505 probe != NULL; |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
506 probe = probe->next()) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
507 if (probe->is_strongly_reachable()) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
508 probe->reset_strongly_reachable(); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
509 probe->oops_do(strong); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
510 } else { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
511 if (weak != NULL) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
512 probe->oops_do(weak); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
513 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
514 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
515 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
516 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
517 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
20197
diff
changeset
|
518 |
| 12837 | 519 uint ProtectionDomainCacheTable::bucket_size() { |
| 520 return sizeof(ProtectionDomainCacheEntry); | |
| 521 } | |
| 522 | |
| 523 #ifndef PRODUCT | |
| 524 void ProtectionDomainCacheTable::print() { | |
| 525 tty->print_cr("Protection domain cache table (table_size=%d, classes=%d)", | |
| 526 table_size(), number_of_entries()); | |
| 527 for (int index = 0; index < table_size(); index++) { | |
| 528 for (ProtectionDomainCacheEntry* probe = bucket(index); | |
| 529 probe != NULL; | |
| 530 probe = probe->next()) { | |
| 531 probe->print(); | |
| 532 } | |
| 533 } | |
| 534 } | |
| 535 | |
| 536 void ProtectionDomainCacheEntry::print() { | |
| 537 tty->print_cr("entry "PTR_FORMAT" value "PTR_FORMAT" strongly_reachable %d next "PTR_FORMAT, | |
| 12840 | 538 this, (void*)literal(), _strongly_reachable, next()); |
| 12837 | 539 } |
| 540 #endif | |
| 541 | |
| 542 void ProtectionDomainCacheTable::verify() { | |
| 543 int element_count = 0; | |
| 544 for (int index = 0; index < table_size(); index++) { | |
| 545 for (ProtectionDomainCacheEntry* probe = bucket(index); | |
| 546 probe != NULL; | |
| 547 probe = probe->next()) { | |
| 548 probe->verify(); | |
| 549 element_count++; | |
| 550 } | |
| 551 } | |
| 552 guarantee(number_of_entries() == element_count, | |
| 553 "Verify of protection domain cache table failed"); | |
| 554 debug_only(verify_lookup_length((double)number_of_entries() / table_size())); | |
| 555 } | |
| 556 | |
| 557 void ProtectionDomainCacheEntry::verify() { | |
| 558 guarantee(literal()->is_oop(), "must be an oop"); | |
| 559 } | |
| 560 | |
| 561 void ProtectionDomainCacheTable::always_strong_oops_do(OopClosure* f) { | |
| 562 // the caller marked the protection domain cache entries that we need to apply | |
| 563 // the closure on. Only process them. | |
| 564 for (int index = 0; index < table_size(); index++) { | |
| 565 for (ProtectionDomainCacheEntry* probe = bucket(index); | |
| 566 probe != NULL; | |
| 567 probe = probe->next()) { | |
| 568 if (probe->is_strongly_reachable()) { | |
| 569 probe->reset_strongly_reachable(); | |
| 570 probe->oops_do(f); | |
| 571 } | |
| 572 } | |
| 573 } | |
| 574 } | |
| 575 | |
| 576 ProtectionDomainCacheEntry* ProtectionDomainCacheTable::get(oop protection_domain) { | |
| 577 unsigned int hash = compute_hash(protection_domain); | |
| 578 int index = hash_to_index(hash); | |
| 579 | |
| 580 ProtectionDomainCacheEntry* entry = find_entry(index, protection_domain); | |
| 581 if (entry == NULL) { | |
| 582 entry = add_entry(index, hash, protection_domain); | |
| 583 } | |
| 584 return entry; | |
| 585 } | |
| 586 | |
| 587 ProtectionDomainCacheEntry* ProtectionDomainCacheTable::find_entry(int index, oop protection_domain) { | |
| 588 for (ProtectionDomainCacheEntry* e = bucket(index); e != NULL; e = e->next()) { | |
| 589 if (e->protection_domain() == protection_domain) { | |
| 590 return e; | |
| 591 } | |
| 592 } | |
| 593 | |
| 594 return NULL; | |
| 595 } | |
| 596 | |
| 597 ProtectionDomainCacheEntry* ProtectionDomainCacheTable::add_entry(int index, unsigned int hash, oop protection_domain) { | |
| 598 assert_locked_or_safepoint(SystemDictionary_lock); | |
| 599 assert(index == index_for(protection_domain), "incorrect index?"); | |
| 600 assert(find_entry(index, protection_domain) == NULL, "no double entry"); | |
| 601 | |
| 602 ProtectionDomainCacheEntry* p = new_entry(hash, protection_domain); | |
| 603 Hashtable<oop, mtClass>::add_entry(index, p); | |
| 604 return p; | |
| 605 } | |
| 606 | |
| 607 void ProtectionDomainCacheTable::free(ProtectionDomainCacheEntry* to_delete) { | |
| 608 unsigned int hash = compute_hash(to_delete->protection_domain()); | |
| 609 int index = hash_to_index(hash); | |
| 610 | |
| 611 ProtectionDomainCacheEntry** p = bucket_addr(index); | |
| 612 ProtectionDomainCacheEntry* entry = bucket(index); | |
| 613 while (true) { | |
| 614 assert(entry != NULL, "sanity"); | |
| 615 | |
| 616 if (entry == to_delete) { | |
| 617 *p = entry->next(); | |
| 618 Hashtable<oop, mtClass>::free_entry(entry); | |
| 619 break; | |
| 620 } else { | |
| 621 p = entry->next_addr(); | |
| 622 entry = *p; | |
| 623 } | |
| 624 } | |
| 625 } | |
| 626 | |
| 710 | 627 SymbolPropertyTable::SymbolPropertyTable(int table_size) |
| 6197 | 628 : Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry)) |
| 710 | 629 { |
| 630 } | |
| 6197 | 631 SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, |
| 710 | 632 int number_of_entries) |
| 6197 | 633 : Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) |
| 710 | 634 { |
| 635 } | |
| 636 | |
| 637 | |
| 638 SymbolPropertyEntry* SymbolPropertyTable::find_entry(int index, unsigned int hash, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
639 Symbol* sym, |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
640 intptr_t sym_mode) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
641 assert(index == index_for(sym, sym_mode), "incorrect index?"); |
| 710 | 642 for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
643 if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { |
| 710 | 644 return p; |
| 645 } | |
| 646 } | |
| 647 return NULL; | |
| 648 } | |
| 649 | |
| 650 | |
| 651 SymbolPropertyEntry* SymbolPropertyTable::add_entry(int index, unsigned int hash, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
652 Symbol* sym, intptr_t sym_mode) { |
| 710 | 653 assert_locked_or_safepoint(SystemDictionary_lock); |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
654 assert(index == index_for(sym, sym_mode), "incorrect index?"); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
655 assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); |
| 710 | 656 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
657 SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); |
| 6197 | 658 Hashtable<Symbol*, mtSymbol>::add_entry(index, p); |
| 710 | 659 return p; |
| 660 } | |
| 661 | |
| 662 void SymbolPropertyTable::oops_do(OopClosure* f) { | |
| 663 for (int index = 0; index < table_size(); index++) { | |
| 664 for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
665 if (p->method_type() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
666 f->do_oop(p->method_type_addr()); |
| 710 | 667 } |
| 668 } | |
| 669 } | |
| 670 } | |
| 671 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
672 void SymbolPropertyTable::methods_do(void f(Method*)) { |
| 710 | 673 for (int index = 0; index < table_size(); index++) { |
| 674 for (SymbolPropertyEntry* p = bucket(index); p != NULL; p = p->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
675 Method* prop = p->method(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
676 if (prop != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
677 f((Method*)prop); |
| 710 | 678 } |
| 679 } | |
| 680 } | |
| 681 } | |
| 682 | |
| 0 | 683 |
| 684 // ---------------------------------------------------------------------------- | |
| 685 #ifndef PRODUCT | |
| 686 | |
| 687 void Dictionary::print() { | |
| 688 ResourceMark rm; | |
| 689 HandleMark hm; | |
| 690 | |
|
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
2426
diff
changeset
|
691 tty->print_cr("Java system dictionary (table_size=%d, classes=%d)", |
|
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
2426
diff
changeset
|
692 table_size(), number_of_entries()); |
| 0 | 693 tty->print_cr("^ indicates that initiating loader is different from " |
| 694 "defining loader"); | |
| 695 | |
| 696 for (int index = 0; index < table_size(); index++) { | |
| 697 for (DictionaryEntry* probe = bucket(index); | |
| 698 probe != NULL; | |
| 699 probe = probe->next()) { | |
| 700 if (Verbose) tty->print("%4d: ", index); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
701 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
702 ClassLoaderData* loader_data = probe->loader_data(); |
| 0 | 703 bool is_defining_class = |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
704 (loader_data == InstanceKlass::cast(e)->class_loader_data()); |
| 0 | 705 tty->print("%s%s", is_defining_class ? " " : "^", |
| 6983 | 706 e->external_name()); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
707 |
| 0 | 708 tty->print(", loader "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
709 loader_data->print_value(); |
| 0 | 710 tty->cr(); |
| 711 } | |
| 712 } | |
| 12837 | 713 tty->cr(); |
| 714 _pd_cache_table->print(); | |
| 715 tty->cr(); | |
| 0 | 716 } |
| 717 | |
| 718 #endif | |
| 719 | |
| 720 void Dictionary::verify() { | |
| 721 guarantee(number_of_entries() >= 0, "Verify of system dictionary failed"); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
722 |
| 0 | 723 int element_count = 0; |
| 724 for (int index = 0; index < table_size(); index++) { | |
| 725 for (DictionaryEntry* probe = bucket(index); | |
| 726 probe != NULL; | |
| 727 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
728 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
729 ClassLoaderData* loader_data = probe->loader_data(); |
| 6983 | 730 guarantee(e->oop_is_instance(), |
| 0 | 731 "Verify of system dictionary failed"); |
| 732 // class loader must be present; a null class loader is the | |
| 733 // boostrap loader | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
734 guarantee(loader_data != NULL || DumpSharedSpaces || |
|
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
735 loader_data->class_loader() == NULL || |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
736 loader_data->class_loader()->is_instance(), |
| 0 | 737 "checking type of class_loader"); |
|
17674
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
12840
diff
changeset
|
738 e->verify(); |
| 0 | 739 probe->verify_protection_domain_set(); |
| 740 element_count++; | |
| 741 } | |
| 742 } | |
| 743 guarantee(number_of_entries() == element_count, | |
| 744 "Verify of system dictionary failed"); | |
| 745 debug_only(verify_lookup_length((double)number_of_entries() / table_size())); | |
| 12837 | 746 |
| 747 _pd_cache_table->verify(); | |
| 0 | 748 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
749 |