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