author | coleenp |
Thu, 18 May 2017 08:17:52 -0400 | |
changeset 46475 | 75902cea18af |
parent 46382 | 5520c435279b |
child 46701 | f559541c0daa |
permissions | -rw-r--r-- |
1 | 1 |
/* |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
42073
diff
changeset
|
2 |
* Copyright (c) 2003, 2017, 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" |
35498
392b50de06c6
8146401: Clean up oop.hpp: add inline directives and fix header files
goetz
parents:
34257
diff
changeset
|
26 |
#include "classfile/classLoaderData.inline.hpp" |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
27 |
#include "classfile/sharedClassUtil.hpp" |
7397 | 28 |
#include "classfile/dictionary.hpp" |
46382
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
29 |
#include "classfile/protectionDomainCache.hpp" |
7397 | 30 |
#include "classfile/systemDictionary.hpp" |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
31 |
#include "classfile/systemDictionaryShared.hpp" |
20405 | 32 |
#include "memory/iterator.hpp" |
37248 | 33 |
#include "memory/resourceArea.hpp" |
7397 | 34 |
#include "oops/oop.inline.hpp" |
24351
61b33cc6d3cf
8042195: Introduce umbrella header orderAccess.inline.hpp.
goetz
parents:
22794
diff
changeset
|
35 |
#include "runtime/orderAccess.inline.hpp" |
7397 | 36 |
#include "utilities/hashtable.inline.hpp" |
1 | 37 |
|
38 |
DictionaryEntry* Dictionary::_current_class_entry = NULL; |
|
39 |
int Dictionary::_current_class_index = 0; |
|
40 |
||
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
41 |
size_t Dictionary::entry_size() { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
42 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
43 |
return SystemDictionaryShared::dictionary_entry_size(); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
44 |
} else { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
45 |
return sizeof(DictionaryEntry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
46 |
} |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
47 |
} |
1 | 48 |
|
49 |
Dictionary::Dictionary(int table_size) |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
50 |
: TwoOopHashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size()) { |
1 | 51 |
_current_class_index = 0; |
52 |
_current_class_entry = NULL; |
|
20405 | 53 |
_pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize); |
1 | 54 |
}; |
55 |
||
56 |
||
13195 | 57 |
Dictionary::Dictionary(int table_size, HashtableBucket<mtClass>* t, |
1 | 58 |
int number_of_entries) |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
59 |
: TwoOopHashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size(), t, number_of_entries) { |
1 | 60 |
_current_class_index = 0; |
61 |
_current_class_entry = NULL; |
|
20405 | 62 |
_pd_cache_table = new ProtectionDomainCacheTable(defaultProtectionDomainCacheSize); |
1 | 63 |
}; |
64 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
65 |
ProtectionDomainCacheEntry* Dictionary::cache_get(Handle protection_domain) { |
20405 | 66 |
return _pd_cache_table->get(protection_domain); |
67 |
} |
|
1 | 68 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
69 |
DictionaryEntry* Dictionary::new_entry(unsigned int hash, InstanceKlass* klass, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
70 |
ClassLoaderData* loader_data) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
71 |
DictionaryEntry* entry = (DictionaryEntry*)Hashtable<InstanceKlass*, mtClass>::new_entry(hash, klass); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
72 |
entry->set_loader_data(loader_data); |
1 | 73 |
entry->set_pd_set(NULL); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
74 |
assert(klass->is_instance_klass(), "Must be"); |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
75 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
76 |
SystemDictionaryShared::init_shared_dictionary_entry(klass, entry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
77 |
} |
1 | 78 |
return entry; |
79 |
} |
|
80 |
||
81 |
||
82 |
void Dictionary::free_entry(DictionaryEntry* entry) { |
|
83 |
// avoid recursion when deleting linked list |
|
84 |
while (entry->pd_set() != NULL) { |
|
85 |
ProtectionDomainEntry* to_delete = entry->pd_set(); |
|
86 |
entry->set_pd_set(to_delete->next()); |
|
87 |
delete to_delete; |
|
88 |
} |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
89 |
Hashtable<InstanceKlass*, mtClass>::free_entry(entry); |
1 | 90 |
} |
91 |
||
92 |
||
93 |
bool DictionaryEntry::contains_protection_domain(oop protection_domain) const { |
|
94 |
#ifdef ASSERT |
|
33602 | 95 |
if (protection_domain == klass()->protection_domain()) { |
1 | 96 |
// Ensure this doesn't show up in the pd_set (invariant) |
97 |
bool in_pd_set = false; |
|
98 |
for (ProtectionDomainEntry* current = _pd_set; |
|
99 |
current != NULL; |
|
100 |
current = current->next()) { |
|
101 |
if (current->protection_domain() == protection_domain) { |
|
102 |
in_pd_set = true; |
|
103 |
break; |
|
104 |
} |
|
105 |
} |
|
106 |
if (in_pd_set) { |
|
107 |
assert(false, "A klass's protection domain should not show up " |
|
108 |
"in its sys. dict. PD set"); |
|
109 |
} |
|
110 |
} |
|
111 |
#endif /* ASSERT */ |
|
112 |
||
33602 | 113 |
if (protection_domain == klass()->protection_domain()) { |
1 | 114 |
// Succeeds trivially |
115 |
return true; |
|
116 |
} |
|
117 |
||
118 |
for (ProtectionDomainEntry* current = _pd_set; |
|
119 |
current != NULL; |
|
120 |
current = current->next()) { |
|
121 |
if (current->protection_domain() == protection_domain) return true; |
|
122 |
} |
|
123 |
return false; |
|
124 |
} |
|
125 |
||
126 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
127 |
void DictionaryEntry::add_protection_domain(Dictionary* dict, Handle protection_domain) { |
1 | 128 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
129 |
if (!contains_protection_domain(protection_domain())) { |
20405 | 130 |
ProtectionDomainCacheEntry* entry = dict->cache_get(protection_domain); |
1 | 131 |
ProtectionDomainEntry* new_head = |
20405 | 132 |
new ProtectionDomainEntry(entry, _pd_set); |
1 | 133 |
// Warning: Preserve store ordering. The SystemDictionary is read |
134 |
// without locks. The new ProtectionDomainEntry must be |
|
135 |
// complete before other threads can be allowed to see it |
|
136 |
// via a store to _pd_set. |
|
137 |
OrderAccess::release_store_ptr(&_pd_set, new_head); |
|
138 |
} |
|
36381
b9ed6bef9364
8149064: TraceProtectionDomainVerification has been converted to Unified Logging.
mockner
parents:
35498
diff
changeset
|
139 |
if (log_is_enabled(Trace, protectiondomain)) { |
b9ed6bef9364
8149064: TraceProtectionDomainVerification has been converted to Unified Logging.
mockner
parents:
35498
diff
changeset
|
140 |
ResourceMark rm; |
37242 | 141 |
outputStream* log = Log(protectiondomain)::trace_stream(); |
36381
b9ed6bef9364
8149064: TraceProtectionDomainVerification has been converted to Unified Logging.
mockner
parents:
35498
diff
changeset
|
142 |
print_count(log); |
1 | 143 |
} |
144 |
} |
|
145 |
||
146 |
||
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
147 |
void Dictionary::do_unloading() { |
5402
c51fd0c1d005
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
2534
diff
changeset
|
148 |
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
1 | 149 |
|
150 |
// Remove unloadable entries and classes from system dictionary |
|
151 |
DictionaryEntry* probe = NULL; |
|
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
152 |
for (int index = 0; index < table_size(); index++) { |
1 | 153 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
154 |
probe = *p; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
155 |
Klass* e = probe->klass(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
156 |
ClassLoaderData* loader_data = probe->loader_data(); |
1 | 157 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
158 |
InstanceKlass* ik = InstanceKlass::cast(e); |
1 | 159 |
|
46382
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
160 |
// Only unload classes that are not strongly reachable |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
161 |
if (!is_strongly_reachable(loader_data, e)) { |
1 | 162 |
// 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
|
163 |
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
|
164 |
ClassLoaderData* k_def_class_loader_data = ik->class_loader_data(); |
1 | 165 |
|
166 |
// Do we need to delete this system dictionary entry? |
|
167 |
bool purge_entry = false; |
|
168 |
||
169 |
// 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
|
170 |
if (loader_data->is_unloading()) { |
1 | 171 |
// 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
|
172 |
// removed (will never be looked up again). |
1 | 173 |
purge_entry = true; |
174 |
} else { |
|
175 |
// 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
|
176 |
// (determined by checking the defining class loader) |
1 | 177 |
// the loader must be an initiating loader (rather than the |
178 |
// defining loader). Remove this entry. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
179 |
if (k_def_class_loader_data->is_unloading()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
180 |
// If we get here, the class_loader_data must not be the defining |
1 | 181 |
// loader, it must be an initiating one. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
182 |
assert(k_def_class_loader_data != loader_data, |
1 | 183 |
"cannot have live defining loader and unreachable klass"); |
184 |
// Loader is live, but class and its defining loader are dead. |
|
185 |
// Remove the entry. The class is going away. |
|
186 |
purge_entry = true; |
|
187 |
} |
|
188 |
} |
|
189 |
||
190 |
if (purge_entry) { |
|
191 |
*p = probe->next(); |
|
192 |
if (probe == _current_class_entry) { |
|
193 |
_current_class_entry = NULL; |
|
194 |
} |
|
195 |
free_entry(probe); |
|
196 |
continue; |
|
197 |
} |
|
198 |
} |
|
199 |
p = probe->next_addr(); |
|
200 |
} |
|
201 |
} |
|
202 |
} |
|
203 |
||
25492
d27050bdfb04
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
25491
diff
changeset
|
204 |
void Dictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) { |
46382
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
205 |
// Do strong roots marking if the closures are the same. |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
206 |
if (strong == weak || !ClassUnloading) { |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
207 |
// Only the protection domain oops contain references into the heap. Iterate |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
208 |
// over all of them. |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
209 |
_pd_cache_table->oops_do(strong); |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
210 |
} else { |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
211 |
if (weak != NULL) { |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
212 |
_pd_cache_table->oops_do(weak); |
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
213 |
} |
25492
d27050bdfb04
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
25491
diff
changeset
|
214 |
} |
46382
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
215 |
} |
25492
d27050bdfb04
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
25491
diff
changeset
|
216 |
|
1 | 217 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
218 |
void Dictionary::remove_classes_in_error_state() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
219 |
assert(DumpSharedSpaces, "supported only when dumping"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
220 |
DictionaryEntry* probe = NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
221 |
for (int index = 0; index < table_size(); index++) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
222 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
223 |
probe = *p; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
224 |
InstanceKlass* ik = InstanceKlass::cast(probe->klass()); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
225 |
if (ik->is_in_error_state()) { // purge this entry |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
226 |
*p = probe->next(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
227 |
if (probe == _current_class_entry) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
228 |
_current_class_entry = NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
229 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
230 |
free_entry(probe); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
231 |
ResourceMark rm; |
27618
790a8bf5488b
8064375: Change certain errors to warnings in CDS output.
jiangli
parents:
26181
diff
changeset
|
232 |
tty->print_cr("Preload Warning: Removed error class: %s", ik->external_name()); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
233 |
continue; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
234 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
235 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
236 |
p = probe->next_addr(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
237 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
238 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
239 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
240 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
241 |
// Just the classes from defining class loaders |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
242 |
void Dictionary::classes_do(void f(Klass*)) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
243 |
for (int index = 0; index < table_size(); index++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
244 |
for (DictionaryEntry* probe = bucket(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
245 |
probe != NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
246 |
probe = probe->next()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
247 |
Klass* k = probe->klass(); |
33602 | 248 |
if (probe->loader_data() == k->class_loader_data()) { |
1 | 249 |
f(k); |
250 |
} |
|
251 |
} |
|
252 |
} |
|
253 |
} |
|
254 |
||
255 |
// Added for initialize_itable_for_klass to handle exceptions |
|
256 |
// Just the classes from defining class loaders |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
257 |
void Dictionary::classes_do(void f(Klass*, TRAPS), TRAPS) { |
1 | 258 |
for (int index = 0; index < table_size(); index++) { |
259 |
for (DictionaryEntry* probe = bucket(index); |
|
260 |
probe != NULL; |
|
261 |
probe = probe->next()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
262 |
Klass* k = probe->klass(); |
33602 | 263 |
if (probe->loader_data() == k->class_loader_data()) { |
1 | 264 |
f(k, CHECK); |
265 |
} |
|
266 |
} |
|
267 |
} |
|
268 |
} |
|
269 |
||
270 |
// All classes, and their class loaders |
|
271 |
// Don't iterate over placeholders |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
272 |
void Dictionary::classes_do(void f(Klass*, ClassLoaderData*)) { |
1 | 273 |
for (int index = 0; index < table_size(); index++) { |
274 |
for (DictionaryEntry* probe = bucket(index); |
|
275 |
probe != NULL; |
|
276 |
probe = probe->next()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
277 |
Klass* k = probe->klass(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
278 |
f(k, probe->loader_data()); |
1 | 279 |
} |
280 |
} |
|
281 |
} |
|
282 |
||
283 |
void Dictionary::oops_do(OopClosure* f) { |
|
20405 | 284 |
// Only the protection domain oops contain references into the heap. Iterate |
285 |
// over all of them. |
|
286 |
_pd_cache_table->oops_do(f); |
|
1 | 287 |
} |
288 |
||
20405 | 289 |
void Dictionary::unlink(BoolObjectClosure* is_alive) { |
290 |
// Only the protection domain cache table may contain references to the heap |
|
291 |
// that need to be unlinked. |
|
292 |
_pd_cache_table->unlink(is_alive); |
|
293 |
} |
|
1 | 294 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
295 |
InstanceKlass* Dictionary::try_get_next_class() { |
1 | 296 |
while (true) { |
297 |
if (_current_class_entry != NULL) { |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
298 |
InstanceKlass* k = _current_class_entry->klass(); |
1 | 299 |
_current_class_entry = _current_class_entry->next(); |
300 |
return k; |
|
301 |
} |
|
302 |
_current_class_index = (_current_class_index + 1) % table_size(); |
|
303 |
_current_class_entry = bucket(_current_class_index); |
|
304 |
} |
|
305 |
// never reached |
|
306 |
} |
|
307 |
||
308 |
// Add a loaded class to the system dictionary. |
|
309 |
// Readers of the SystemDictionary aren't always locked, so _buckets |
|
310 |
// is volatile. The store of the next field in the constructor is |
|
311 |
// also cast to volatile; we do this to ensure store order is maintained |
|
312 |
// by the compilers. |
|
313 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
314 |
void Dictionary::add_klass(Symbol* class_name, ClassLoaderData* loader_data, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
315 |
InstanceKlass* obj) { |
1 | 316 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
317 |
assert(obj != NULL, "adding NULL obj"); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
318 |
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
|
319 |
assert(loader_data != NULL, "Must be non-NULL"); |
1 | 320 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
321 |
unsigned int hash = compute_hash(class_name, loader_data); |
1 | 322 |
int index = hash_to_index(hash); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
323 |
DictionaryEntry* entry = new_entry(hash, obj, loader_data); |
1 | 324 |
add_entry(index, entry); |
325 |
} |
|
326 |
||
327 |
||
328 |
// This routine does not lock the system dictionary. |
|
329 |
// |
|
330 |
// Since readers don't hold a lock, we must make sure that system |
|
331 |
// dictionary entries are only removed at a safepoint (when only one |
|
332 |
// thread is running), and are added to in a safe way (all links must |
|
333 |
// be updated in an MT-safe manner). |
|
334 |
// |
|
335 |
// Callers should be aware that an entry could be added just after |
|
336 |
// _buckets[index] is read here, so the caller will not see the new entry. |
|
337 |
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
|
338 |
Symbol* class_name, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
339 |
ClassLoaderData* loader_data) { |
1 | 340 |
for (DictionaryEntry* entry = bucket(index); |
341 |
entry != NULL; |
|
342 |
entry = entry->next()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
343 |
if (entry->hash() == hash && entry->equals(class_name, loader_data)) { |
1 | 344 |
return entry; |
345 |
} |
|
346 |
} |
|
347 |
return NULL; |
|
348 |
} |
|
349 |
||
350 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
351 |
InstanceKlass* Dictionary::find(int index, unsigned int hash, Symbol* name, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
352 |
ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
353 |
DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
1 | 354 |
if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { |
355 |
return entry->klass(); |
|
356 |
} else { |
|
357 |
return NULL; |
|
358 |
} |
|
359 |
} |
|
360 |
||
361 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
362 |
InstanceKlass* Dictionary::find_class(int index, unsigned int hash, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
363 |
Symbol* name, ClassLoaderData* loader_data) { |
1 | 364 |
assert_locked_or_safepoint(SystemDictionary_lock); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
365 |
assert (index == index_for(name, loader_data), "incorrect index?"); |
1 | 366 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
367 |
DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
368 |
return (entry != NULL) ? entry->klass() : NULL; |
1 | 369 |
} |
370 |
||
371 |
||
372 |
// Variant of find_class for shared classes. No locking required, as |
|
373 |
// that table is static. |
|
374 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
375 |
InstanceKlass* Dictionary::find_shared_class(int index, unsigned int hash, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
376 |
Symbol* name) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
377 |
assert (index == index_for(name, NULL), "incorrect index?"); |
1 | 378 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
379 |
DictionaryEntry* entry = get_entry(index, hash, name, NULL); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
380 |
return (entry != NULL) ? entry->klass() : NULL; |
1 | 381 |
} |
382 |
||
383 |
||
384 |
void Dictionary::add_protection_domain(int index, unsigned int hash, |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
385 |
InstanceKlass* klass, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
386 |
ClassLoaderData* loader_data, Handle protection_domain, |
1 | 387 |
TRAPS) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
388 |
Symbol* klass_name = klass->name(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
389 |
DictionaryEntry* entry = get_entry(index, hash, klass_name, loader_data); |
1 | 390 |
|
391 |
assert(entry != NULL,"entry must be present, we just created it"); |
|
392 |
assert(protection_domain() != NULL, |
|
393 |
"real protection domain should be present"); |
|
394 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
395 |
entry->add_protection_domain(this, protection_domain); |
1 | 396 |
|
397 |
assert(entry->contains_protection_domain(protection_domain()), |
|
398 |
"now protection domain should be present"); |
|
399 |
} |
|
400 |
||
401 |
||
402 |
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
|
403 |
Symbol* name, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
404 |
ClassLoaderData* loader_data, |
1 | 405 |
Handle protection_domain) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
406 |
DictionaryEntry* entry = get_entry(index, hash, name, loader_data); |
1 | 407 |
return entry->is_valid_protection_domain(protection_domain); |
408 |
} |
|
409 |
||
410 |
||
411 |
void Dictionary::reorder_dictionary() { |
|
412 |
||
413 |
// Copy all the dictionary entries into a single master list. |
|
414 |
||
415 |
DictionaryEntry* master_list = NULL; |
|
416 |
for (int i = 0; i < table_size(); ++i) { |
|
417 |
DictionaryEntry* p = bucket(i); |
|
418 |
while (p != NULL) { |
|
419 |
DictionaryEntry* tmp; |
|
420 |
tmp = p->next(); |
|
421 |
p->set_next(master_list); |
|
422 |
master_list = p; |
|
423 |
p = tmp; |
|
424 |
} |
|
425 |
set_entry(i, NULL); |
|
426 |
} |
|
427 |
||
428 |
// Add the dictionary entries back to the list in the correct buckets. |
|
429 |
while (master_list != NULL) { |
|
430 |
DictionaryEntry* p = master_list; |
|
431 |
master_list = master_list->next(); |
|
432 |
p->set_next(NULL); |
|
33602 | 433 |
Symbol* class_name = p->klass()->name(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
434 |
// 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
|
435 |
// compute the hash with NULL for loader data. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
436 |
unsigned int hash = compute_hash(class_name, NULL); |
1 | 437 |
int index = hash_to_index(hash); |
438 |
p->set_hash(hash); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
439 |
p->set_loader_data(NULL); // loader_data isn't copied to CDS |
1 | 440 |
p->set_next(bucket(index)); |
441 |
set_entry(index, p); |
|
442 |
} |
|
443 |
} |
|
444 |
||
35498
392b50de06c6
8146401: Clean up oop.hpp: add inline directives and fix header files
goetz
parents:
34257
diff
changeset
|
445 |
|
2534 | 446 |
SymbolPropertyTable::SymbolPropertyTable(int table_size) |
13195 | 447 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry)) |
2534 | 448 |
{ |
449 |
} |
|
13195 | 450 |
SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, |
2534 | 451 |
int number_of_entries) |
13195 | 452 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) |
2534 | 453 |
{ |
454 |
} |
|
455 |
||
456 |
||
457 |
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
|
458 |
Symbol* sym, |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
459 |
intptr_t sym_mode) { |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
460 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
2534 | 461 |
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
|
462 |
if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { |
2534 | 463 |
return p; |
464 |
} |
|
465 |
} |
|
466 |
return NULL; |
|
467 |
} |
|
468 |
||
469 |
||
470 |
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
|
471 |
Symbol* sym, intptr_t sym_mode) { |
2534 | 472 |
assert_locked_or_safepoint(SystemDictionary_lock); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
473 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
474 |
assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); |
2534 | 475 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
476 |
SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); |
13195 | 477 |
Hashtable<Symbol*, mtSymbol>::add_entry(index, p); |
2534 | 478 |
return p; |
479 |
} |
|
480 |
||
481 |
void SymbolPropertyTable::oops_do(OopClosure* f) { |
|
482 |
for (int index = 0; index < table_size(); index++) { |
|
483 |
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
|
484 |
if (p->method_type() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
485 |
f->do_oop(p->method_type_addr()); |
2534 | 486 |
} |
487 |
} |
|
488 |
} |
|
489 |
} |
|
490 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
491 |
void SymbolPropertyTable::methods_do(void f(Method*)) { |
2534 | 492 |
for (int index = 0; index < table_size(); index++) { |
493 |
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
|
494 |
Method* prop = p->method(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
495 |
if (prop != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
496 |
f((Method*)prop); |
2534 | 497 |
} |
498 |
} |
|
499 |
} |
|
500 |
} |
|
501 |
||
1 | 502 |
|
503 |
// ---------------------------------------------------------------------------- |
|
504 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
505 |
void Dictionary::print(bool details) { |
1 | 506 |
ResourceMark rm; |
507 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
508 |
if (details) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
509 |
tty->print_cr("Java system dictionary (table_size=%d, classes=%d)", |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
510 |
table_size(), number_of_entries()); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
511 |
tty->print_cr("^ indicates that initiating loader is different from " |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
512 |
"defining loader"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
513 |
} |
1 | 514 |
|
515 |
for (int index = 0; index < table_size(); index++) { |
|
516 |
for (DictionaryEntry* probe = bucket(index); |
|
517 |
probe != NULL; |
|
518 |
probe = probe->next()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
519 |
Klass* e = probe->klass(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
520 |
ClassLoaderData* loader_data = probe->loader_data(); |
1 | 521 |
bool is_defining_class = |
33602 | 522 |
(loader_data == e->class_loader_data()); |
39982
1a3808e3f4d9
8138760: [JVMCI] VM warning: Performance bug: SystemDictionary lookup_count=21831450 lookup_length=1275207287 average=58.411479 load=5.572844
gziemski
parents:
38259
diff
changeset
|
523 |
if (details) { |
42073
89e056fd82cc
8166145: runtime/threads/ThreadInterruptTest3 fails with ExitCode 0
gziemski
parents:
39982
diff
changeset
|
524 |
tty->print("%4d: ", index); |
39982
1a3808e3f4d9
8138760: [JVMCI] VM warning: Performance bug: SystemDictionary lookup_count=21831450 lookup_length=1275207287 average=58.411479 load=5.572844
gziemski
parents:
38259
diff
changeset
|
525 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
526 |
tty->print("%s%s", ((!details) || is_defining_class) ? " " : "^", |
39982
1a3808e3f4d9
8138760: [JVMCI] VM warning: Performance bug: SystemDictionary lookup_count=21831450 lookup_length=1275207287 average=58.411479 load=5.572844
gziemski
parents:
38259
diff
changeset
|
527 |
e->external_name()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
528 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
529 |
if (details) { |
1 | 530 |
tty->print(", loader "); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
531 |
if (loader_data != NULL) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
532 |
loader_data->print_value(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
533 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
534 |
tty->print("NULL"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
535 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
536 |
} |
1 | 537 |
tty->cr(); |
538 |
} |
|
539 |
} |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
540 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
541 |
if (details) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
542 |
tty->cr(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
543 |
_pd_cache_table->print(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
544 |
} |
20405 | 545 |
tty->cr(); |
1 | 546 |
} |
547 |
||
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
548 |
void DictionaryEntry::verify() { |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
549 |
Klass* e = klass(); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
550 |
ClassLoaderData* cld = loader_data(); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
551 |
guarantee(e->is_instance_klass(), |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
552 |
"Verify of system dictionary failed"); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
553 |
// class loader must be present; a null class loader is the |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
554 |
// boostrap loader |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
555 |
guarantee(cld != NULL || DumpSharedSpaces || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
556 |
cld->class_loader() == NULL || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
557 |
cld->class_loader()->is_instance(), |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
558 |
"checking type of class_loader"); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
559 |
e->verify(); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
560 |
verify_protection_domain_set(); |
42073
89e056fd82cc
8166145: runtime/threads/ThreadInterruptTest3 fails with ExitCode 0
gziemski
parents:
39982
diff
changeset
|
561 |
} |
89e056fd82cc
8166145: runtime/threads/ThreadInterruptTest3 fails with ExitCode 0
gziemski
parents:
39982
diff
changeset
|
562 |
|
1 | 563 |
void Dictionary::verify() { |
564 |
guarantee(number_of_entries() >= 0, "Verify of system dictionary failed"); |
|
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
565 |
verify_table<DictionaryEntry>("System Dictionary"); |
20405 | 566 |
_pd_cache_table->verify(); |
1 | 567 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
568 |