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