Mercurial > hg > graal-compiler
annotate src/share/vm/classfile/dictionary.cpp @ 6725:da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
| author | coleenp |
|---|---|
| date | Sat, 01 Sep 2012 13:25:18 -0400 |
| parents | d2a62e0f25eb |
| children | 070d523b96a7 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
2426
diff
changeset
|
2 * Copyright (c) 2003, 2012, 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" | |
| 28 #include "oops/oop.inline.hpp" | |
| 29 #include "prims/jvmtiRedefineClassesTrace.hpp" | |
| 30 #include "services/classLoadingService.hpp" | |
| 31 #include "utilities/hashtable.inline.hpp" | |
| 0 | 32 |
| 33 | |
| 34 DictionaryEntry* Dictionary::_current_class_entry = NULL; | |
| 35 int Dictionary::_current_class_index = 0; | |
| 36 | |
| 37 | |
| 38 Dictionary::Dictionary(int table_size) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
39 : TwoOopHashtable<Klass*, mtClass>(table_size, sizeof(DictionaryEntry)) { |
| 0 | 40 _current_class_index = 0; |
| 41 _current_class_entry = NULL; | |
| 42 }; | |
| 43 | |
| 44 | |
| 45 | |
| 6197 | 46 Dictionary::Dictionary(int table_size, HashtableBucket<mtClass>* t, |
| 0 | 47 int number_of_entries) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
48 : TwoOopHashtable<Klass*, mtClass>(table_size, sizeof(DictionaryEntry), t, number_of_entries) { |
| 0 | 49 _current_class_index = 0; |
| 50 _current_class_entry = NULL; | |
| 51 }; | |
| 52 | |
| 53 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
54 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
|
55 ClassLoaderData* loader_data) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
56 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
|
57 entry->set_loader_data(loader_data); |
| 0 | 58 entry->set_pd_set(NULL); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
59 assert(klass->oop_is_instance(), "Must be"); |
| 0 | 60 return entry; |
| 61 } | |
| 62 | |
| 63 | |
| 64 void Dictionary::free_entry(DictionaryEntry* entry) { | |
| 65 // avoid recursion when deleting linked list | |
| 66 while (entry->pd_set() != NULL) { | |
| 67 ProtectionDomainEntry* to_delete = entry->pd_set(); | |
| 68 entry->set_pd_set(to_delete->next()); | |
| 69 delete to_delete; | |
| 70 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
71 Hashtable<Klass*, mtClass>::free_entry(entry); |
| 0 | 72 } |
| 73 | |
| 74 | |
| 75 bool DictionaryEntry::contains_protection_domain(oop protection_domain) const { | |
| 76 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
77 if (protection_domain == InstanceKlass::cast(klass())->protection_domain()) { |
| 0 | 78 // Ensure this doesn't show up in the pd_set (invariant) |
| 79 bool in_pd_set = false; | |
| 80 for (ProtectionDomainEntry* current = _pd_set; | |
| 81 current != NULL; | |
| 82 current = current->next()) { | |
| 83 if (current->protection_domain() == protection_domain) { | |
| 84 in_pd_set = true; | |
| 85 break; | |
| 86 } | |
| 87 } | |
| 88 if (in_pd_set) { | |
| 89 assert(false, "A klass's protection domain should not show up " | |
| 90 "in its sys. dict. PD set"); | |
| 91 } | |
| 92 } | |
| 93 #endif /* ASSERT */ | |
| 94 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
95 if (protection_domain == InstanceKlass::cast(klass())->protection_domain()) { |
| 0 | 96 // Succeeds trivially |
| 97 return true; | |
| 98 } | |
| 99 | |
| 100 for (ProtectionDomainEntry* current = _pd_set; | |
| 101 current != NULL; | |
| 102 current = current->next()) { | |
| 103 if (current->protection_domain() == protection_domain) return true; | |
| 104 } | |
| 105 return false; | |
| 106 } | |
| 107 | |
| 108 | |
| 109 void DictionaryEntry::add_protection_domain(oop protection_domain) { | |
| 110 assert_locked_or_safepoint(SystemDictionary_lock); | |
| 111 if (!contains_protection_domain(protection_domain)) { | |
| 112 ProtectionDomainEntry* new_head = | |
| 113 new ProtectionDomainEntry(protection_domain, _pd_set); | |
| 114 // Warning: Preserve store ordering. The SystemDictionary is read | |
| 115 // without locks. The new ProtectionDomainEntry must be | |
| 116 // complete before other threads can be allowed to see it | |
| 117 // via a store to _pd_set. | |
| 118 OrderAccess::release_store_ptr(&_pd_set, new_head); | |
| 119 } | |
| 120 if (TraceProtectionDomainVerification && WizardMode) { | |
| 121 print(); | |
| 122 } | |
| 123 } | |
| 124 | |
| 125 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
126 bool Dictionary::do_unloading() { |
|
1489
cff162798819
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
710
diff
changeset
|
127 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
| 0 | 128 bool class_was_unloaded = false; |
| 129 int index = 0; // Defined here for portability! Do not move | |
| 130 | |
| 131 // Remove unloadable entries and classes from system dictionary | |
| 132 // The placeholder array has been handled in always_strong_oops_do. | |
| 133 DictionaryEntry* probe = NULL; | |
| 134 for (index = 0; index < table_size(); index++) { | |
| 135 for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { | |
| 136 probe = *p; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
137 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
138 ClassLoaderData* loader_data = probe->loader_data(); |
| 0 | 139 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
140 InstanceKlass* ik = InstanceKlass::cast(e); |
| 0 | 141 |
| 142 // 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
|
143 if (!is_strongly_reachable(loader_data, e)) { |
| 0 | 144 // 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
|
145 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
|
146 ClassLoaderData* k_def_class_loader_data = ik->class_loader_data(); |
| 0 | 147 |
| 148 // Do we need to delete this system dictionary entry? | |
| 149 bool purge_entry = false; | |
| 150 | |
| 151 // 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
|
152 if (loader_data->is_unloading()) { |
| 0 | 153 // If the loader is not live this entry should always be |
| 154 // removed (will never be looked up again). Note that this is | |
| 155 // not the same as unloading the referred class. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
156 if (k_def_class_loader_data == loader_data) { |
| 0 | 157 // This is the defining entry, so the referred class is about |
| 158 // to be unloaded. | |
| 159 // Notify the debugger and clean up the class. | |
| 160 class_was_unloaded = true; | |
| 161 // notify the debugger | |
| 162 if (JvmtiExport::should_post_class_unload()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
163 JvmtiExport::post_class_unload(ik); |
| 0 | 164 } |
| 165 | |
| 166 // notify ClassLoadingService of class unload | |
| 167 ClassLoadingService::notify_class_unloaded(ik); | |
| 168 | |
| 169 // Clean up C heap | |
| 170 ik->release_C_heap_structures(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
171 ik->constants()->release_C_heap_structures(); |
| 0 | 172 } |
| 173 // Also remove this system dictionary entry. | |
| 174 purge_entry = true; | |
| 175 | |
| 176 } else { | |
| 177 // 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
|
178 // (determined by checking the defining class loader) |
| 0 | 179 // the loader must be an initiating loader (rather than the |
| 180 // defining loader). Remove this entry. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
181 if (k_def_class_loader_data->is_unloading()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
182 // If we get here, the class_loader_data must not be the defining |
| 0 | 183 // loader, it must be an initiating one. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
184 assert(k_def_class_loader_data != loader_data, |
| 0 | 185 "cannot have live defining loader and unreachable klass"); |
| 186 // Loader is live, but class and its defining loader are dead. | |
| 187 // Remove the entry. The class is going away. | |
| 188 purge_entry = true; | |
| 189 } | |
| 190 } | |
| 191 | |
| 192 if (purge_entry) { | |
| 193 *p = probe->next(); | |
| 194 if (probe == _current_class_entry) { | |
| 195 _current_class_entry = NULL; | |
| 196 } | |
| 197 free_entry(probe); | |
| 198 continue; | |
| 199 } | |
| 200 } | |
| 201 p = probe->next_addr(); | |
| 202 } | |
| 203 } | |
| 204 return class_was_unloaded; | |
| 205 } | |
| 206 | |
| 207 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
208 void Dictionary::always_strong_oops_do(OopClosure* blk) { |
| 0 | 209 // Follow all system classes and temporary placeholders in dictionary |
| 210 for (int index = 0; index < table_size(); index++) { | |
| 211 for (DictionaryEntry *probe = bucket(index); | |
| 212 probe != NULL; | |
| 213 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
214 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
215 ClassLoaderData* loader_data = probe->loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
216 if (is_strongly_reachable(loader_data, e)) { |
| 0 | 217 probe->protection_domain_set_oops_do(blk); |
| 218 } | |
| 219 } | |
| 220 } | |
| 221 } | |
| 222 | |
| 223 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
224 void Dictionary::always_strong_classes_do(KlassClosure* closure) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
225 // Follow all system classes and temporary placeholders in dictionary |
| 0 | 226 for (int index = 0; index < table_size(); index++) { |
| 227 for (DictionaryEntry* probe = bucket(index); | |
| 228 probe != NULL; | |
| 229 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
230 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
231 ClassLoaderData* loader_data = probe->loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
232 if (is_strongly_reachable(loader_data, e)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
233 closure->do_klass(e); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
234 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
235 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
236 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
237 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
238 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
239 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
240 // Just the classes from defining class loaders |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
241 void Dictionary::classes_do(void f(Klass*)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
242 for (int index = 0; index < table_size(); index++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
243 for (DictionaryEntry* probe = bucket(index); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
244 probe != NULL; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
245 probe = probe->next()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
246 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
247 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 248 f(k); |
| 249 } | |
| 250 } | |
| 251 } | |
| 252 } | |
| 253 | |
| 254 // Added for initialize_itable_for_klass to handle exceptions | |
| 255 // Just the classes from defining class loaders | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
256 void Dictionary::classes_do(void f(Klass*, TRAPS), TRAPS) { |
| 0 | 257 for (int index = 0; index < table_size(); index++) { |
| 258 for (DictionaryEntry* probe = bucket(index); | |
| 259 probe != NULL; | |
| 260 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
261 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
262 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 263 f(k, CHECK); |
| 264 } | |
| 265 } | |
| 266 } | |
| 267 } | |
| 268 | |
| 269 | |
| 270 // All classes, and their class loaders | |
| 271 // (added for helpers that use HandleMarks and ResourceMarks) | |
| 272 // Don't iterate over placeholders | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
273 void Dictionary::classes_do(void f(Klass*, ClassLoaderData*, TRAPS), TRAPS) { |
| 0 | 274 for (int index = 0; index < table_size(); index++) { |
| 275 for (DictionaryEntry* probe = bucket(index); | |
| 276 probe != NULL; | |
| 277 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
278 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
279 f(k, probe->loader_data(), CHECK); |
| 0 | 280 } |
| 281 } | |
| 282 } | |
| 283 | |
| 284 | |
| 285 // All classes, and their class loaders | |
| 286 // Don't iterate over placeholders | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
287 void Dictionary::classes_do(void f(Klass*, ClassLoaderData*)) { |
| 0 | 288 for (int index = 0; index < table_size(); index++) { |
| 289 for (DictionaryEntry* probe = bucket(index); | |
| 290 probe != NULL; | |
| 291 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
292 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
293 f(k, probe->loader_data()); |
| 0 | 294 } |
| 295 } | |
| 296 } | |
| 297 | |
| 298 | |
| 299 void Dictionary::oops_do(OopClosure* f) { | |
| 300 for (int index = 0; index < table_size(); index++) { | |
| 301 for (DictionaryEntry* probe = bucket(index); | |
| 302 probe != NULL; | |
| 303 probe = probe->next()) { | |
| 304 probe->protection_domain_set_oops_do(f); | |
| 305 } | |
| 306 } | |
| 307 } | |
| 308 | |
| 309 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
310 void Dictionary::methods_do(void f(Method*)) { |
| 0 | 311 for (int index = 0; index < table_size(); index++) { |
| 312 for (DictionaryEntry* probe = bucket(index); | |
| 313 probe != NULL; | |
| 314 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
315 Klass* k = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
316 if (probe->loader_data() == InstanceKlass::cast(k)->class_loader_data()) { |
| 0 | 317 // 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
|
318 InstanceKlass::cast(k)->methods_do(f); |
| 0 | 319 } |
| 320 } | |
| 321 } | |
| 322 } | |
| 323 | |
| 324 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
325 Klass* Dictionary::try_get_next_class() { |
| 0 | 326 while (true) { |
| 327 if (_current_class_entry != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
328 Klass* k = _current_class_entry->klass(); |
| 0 | 329 _current_class_entry = _current_class_entry->next(); |
| 330 return k; | |
| 331 } | |
| 332 _current_class_index = (_current_class_index + 1) % table_size(); | |
| 333 _current_class_entry = bucket(_current_class_index); | |
| 334 } | |
| 335 // never reached | |
| 336 } | |
| 337 | |
| 338 | |
| 339 // Add a loaded class to the system dictionary. | |
| 340 // Readers of the SystemDictionary aren't always locked, so _buckets | |
| 341 // is volatile. The store of the next field in the constructor is | |
| 342 // also cast to volatile; we do this to ensure store order is maintained | |
| 343 // by the compilers. | |
| 344 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
345 void Dictionary::add_klass(Symbol* class_name, ClassLoaderData* loader_data, |
| 0 | 346 KlassHandle obj) { |
| 347 assert_locked_or_safepoint(SystemDictionary_lock); | |
| 348 assert(obj() != NULL, "adding NULL obj"); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
349 assert(Klass::cast(obj())->name() == class_name, "sanity check on name"); |
| 0 | 350 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
351 unsigned int hash = compute_hash(class_name, loader_data); |
| 0 | 352 int index = hash_to_index(hash); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
353 DictionaryEntry* entry = new_entry(hash, obj(), loader_data); |
| 0 | 354 add_entry(index, entry); |
| 355 } | |
| 356 | |
| 357 | |
| 358 // This routine does not lock the system dictionary. | |
| 359 // | |
| 360 // Since readers don't hold a lock, we must make sure that system | |
| 361 // dictionary entries are only removed at a safepoint (when only one | |
| 362 // thread is running), and are added to in a safe way (all links must | |
| 363 // be updated in an MT-safe manner). | |
| 364 // | |
| 365 // Callers should be aware that an entry could be added just after | |
| 366 // _buckets[index] is read here, so the caller will not see the new entry. | |
| 367 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
|
368 Symbol* class_name, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
369 ClassLoaderData* loader_data) { |
| 0 | 370 debug_only(_lookup_count++); |
| 371 for (DictionaryEntry* entry = bucket(index); | |
| 372 entry != NULL; | |
| 373 entry = entry->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
374 if (entry->hash() == hash && entry->equals(class_name, loader_data)) { |
| 0 | 375 return entry; |
| 376 } | |
| 377 debug_only(_lookup_length++); | |
| 378 } | |
| 379 return NULL; | |
| 380 } | |
| 381 | |
| 382 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
383 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
|
384 ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
385 DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
| 0 | 386 if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { |
| 387 return entry->klass(); | |
| 388 } else { | |
| 389 return NULL; | |
| 390 } | |
| 391 } | |
| 392 | |
| 393 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
394 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
|
395 Symbol* name, ClassLoaderData* loader_data) { |
| 0 | 396 assert_locked_or_safepoint(SystemDictionary_lock); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
397 assert (index == index_for(name, loader_data), "incorrect index?"); |
| 0 | 398 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
399 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
|
400 return (entry != NULL) ? entry->klass() : (Klass*)NULL; |
| 0 | 401 } |
| 402 | |
| 403 | |
| 404 // Variant of find_class for shared classes. No locking required, as | |
| 405 // that table is static. | |
| 406 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
407 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
|
408 Symbol* name) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
409 assert (index == index_for(name, NULL), "incorrect index?"); |
| 0 | 410 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
411 DictionaryEntry* entry = get_entry(index, hash, name, NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
412 return (entry != NULL) ? entry->klass() : (Klass*)NULL; |
| 0 | 413 } |
| 414 | |
| 415 | |
| 416 void Dictionary::add_protection_domain(int index, unsigned int hash, | |
| 417 instanceKlassHandle klass, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
418 ClassLoaderData* loader_data, Handle protection_domain, |
| 0 | 419 TRAPS) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
420 Symbol* klass_name = klass->name(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
421 DictionaryEntry* entry = get_entry(index, hash, klass_name, loader_data); |
| 0 | 422 |
| 423 assert(entry != NULL,"entry must be present, we just created it"); | |
| 424 assert(protection_domain() != NULL, | |
| 425 "real protection domain should be present"); | |
| 426 | |
| 427 entry->add_protection_domain(protection_domain()); | |
| 428 | |
| 429 assert(entry->contains_protection_domain(protection_domain()), | |
| 430 "now protection domain should be present"); | |
| 431 } | |
| 432 | |
| 433 | |
| 434 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
|
435 Symbol* name, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
436 ClassLoaderData* loader_data, |
| 0 | 437 Handle protection_domain) { |
|
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, loader_data); |
| 0 | 439 return entry->is_valid_protection_domain(protection_domain); |
| 440 } | |
| 441 | |
| 442 | |
| 443 void Dictionary::reorder_dictionary() { | |
| 444 | |
| 445 // Copy all the dictionary entries into a single master list. | |
| 446 | |
| 447 DictionaryEntry* master_list = NULL; | |
| 448 for (int i = 0; i < table_size(); ++i) { | |
| 449 DictionaryEntry* p = bucket(i); | |
| 450 while (p != NULL) { | |
| 451 DictionaryEntry* tmp; | |
| 452 tmp = p->next(); | |
| 453 p->set_next(master_list); | |
| 454 master_list = p; | |
| 455 p = tmp; | |
| 456 } | |
| 457 set_entry(i, NULL); | |
| 458 } | |
| 459 | |
| 460 // Add the dictionary entries back to the list in the correct buckets. | |
| 461 while (master_list != NULL) { | |
| 462 DictionaryEntry* p = master_list; | |
| 463 master_list = master_list->next(); | |
| 464 p->set_next(NULL); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
465 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
|
466 // 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
|
467 // compute the hash with NULL for loader data. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
468 unsigned int hash = compute_hash(class_name, NULL); |
| 0 | 469 int index = hash_to_index(hash); |
| 470 p->set_hash(hash); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
471 p->set_loader_data(NULL); // loader_data isn't copied to CDS |
| 0 | 472 p->set_next(bucket(index)); |
| 473 set_entry(index, p); | |
| 474 } | |
| 475 } | |
| 476 | |
| 710 | 477 SymbolPropertyTable::SymbolPropertyTable(int table_size) |
| 6197 | 478 : Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry)) |
| 710 | 479 { |
| 480 } | |
| 6197 | 481 SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, |
| 710 | 482 int number_of_entries) |
| 6197 | 483 : Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) |
| 710 | 484 { |
| 485 } | |
| 486 | |
| 487 | |
| 488 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
|
489 Symbol* sym, |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
490 intptr_t sym_mode) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
491 assert(index == index_for(sym, sym_mode), "incorrect index?"); |
| 710 | 492 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
|
493 if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { |
| 710 | 494 return p; |
| 495 } | |
| 496 } | |
| 497 return NULL; | |
| 498 } | |
| 499 | |
| 500 | |
| 501 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
|
502 Symbol* sym, intptr_t sym_mode) { |
| 710 | 503 assert_locked_or_safepoint(SystemDictionary_lock); |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
504 assert(index == index_for(sym, sym_mode), "incorrect index?"); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
710
diff
changeset
|
505 assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); |
| 710 | 506 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
507 SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); |
| 6197 | 508 Hashtable<Symbol*, mtSymbol>::add_entry(index, p); |
| 710 | 509 return p; |
| 510 } | |
| 511 | |
| 512 void SymbolPropertyTable::oops_do(OopClosure* f) { | |
| 513 for (int index = 0; index < table_size(); index++) { | |
| 514 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
|
515 if (p->method_type() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
516 f->do_oop(p->method_type_addr()); |
| 710 | 517 } |
| 518 } | |
| 519 } | |
| 520 } | |
| 521 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
522 void SymbolPropertyTable::methods_do(void f(Method*)) { |
| 710 | 523 for (int index = 0; index < table_size(); index++) { |
| 524 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
|
525 Method* prop = p->method(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
526 if (prop != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
527 f((Method*)prop); |
| 710 | 528 } |
| 529 } | |
| 530 } | |
| 531 } | |
| 532 | |
| 0 | 533 |
| 534 // ---------------------------------------------------------------------------- | |
| 535 #ifndef PRODUCT | |
| 536 | |
| 537 void Dictionary::print() { | |
| 538 ResourceMark rm; | |
| 539 HandleMark hm; | |
| 540 | |
|
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
2426
diff
changeset
|
541 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
|
542 table_size(), number_of_entries()); |
| 0 | 543 tty->print_cr("^ indicates that initiating loader is different from " |
| 544 "defining loader"); | |
| 545 | |
| 546 for (int index = 0; index < table_size(); index++) { | |
| 547 for (DictionaryEntry* probe = bucket(index); | |
| 548 probe != NULL; | |
| 549 probe = probe->next()) { | |
| 550 if (Verbose) tty->print("%4d: ", index); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
551 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
552 ClassLoaderData* loader_data = probe->loader_data(); |
| 0 | 553 bool is_defining_class = |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
554 (loader_data == InstanceKlass::cast(e)->class_loader_data()); |
| 0 | 555 tty->print("%s%s", is_defining_class ? " " : "^", |
| 556 Klass::cast(e)->external_name()); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
557 |
| 0 | 558 tty->print(", loader "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
559 loader_data->print_value(); |
| 0 | 560 tty->cr(); |
| 561 } | |
| 562 } | |
| 563 } | |
| 564 | |
| 565 #endif | |
| 566 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
567 |
| 0 | 568 void Dictionary::verify() { |
| 569 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
|
570 |
| 0 | 571 int element_count = 0; |
| 572 for (int index = 0; index < table_size(); index++) { | |
| 573 for (DictionaryEntry* probe = bucket(index); | |
| 574 probe != NULL; | |
| 575 probe = probe->next()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
576 Klass* e = probe->klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
577 ClassLoaderData* loader_data = probe->loader_data(); |
| 0 | 578 guarantee(Klass::cast(e)->oop_is_instance(), |
| 579 "Verify of system dictionary failed"); | |
| 580 // class loader must be present; a null class loader is the | |
| 581 // boostrap loader | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
582 guarantee(loader_data != NULL || DumpSharedSpaces || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
583 loader_data->is_the_null_class_loader_data() || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
584 loader_data->class_loader()->is_instance(), |
| 0 | 585 "checking type of class_loader"); |
| 586 e->verify(); | |
| 587 probe->verify_protection_domain_set(); | |
| 588 element_count++; | |
| 589 } | |
| 590 } | |
| 591 guarantee(number_of_entries() == element_count, | |
| 592 "Verify of system dictionary failed"); | |
| 593 debug_only(verify_lookup_length((double)number_of_entries() / table_size())); | |
| 594 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6197
diff
changeset
|
595 |