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