author | simonis |
Tue, 19 Jun 2018 09:43:53 +0200 | |
changeset 50625 | d9753e3db0c6 |
parent 50429 | 83aec1d357d4 |
child 50634 | c349d409262a |
permissions | -rw-r--r-- |
1 | 1 |
/* |
48781
6ebef5cd0c8d
8194736: Refactor weak oops in ProtectionDomain table to use the Access API
eosterlund
parents:
47774
diff
changeset
|
2 |
* Copyright (c) 2003, 2018, 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" |
49340
4e82736053ae
8191102: Incorrect include file use in classLoader.hpp
hseigel
parents:
49329
diff
changeset
|
27 |
#include "classfile/dictionary.inline.hpp" |
46382
5520c435279b
8178336: Unnecessary SystemDictionary walk for Protection domain liveness
coleenp
parents:
46380
diff
changeset
|
28 |
#include "classfile/protectionDomainCache.hpp" |
7397 | 29 |
#include "classfile/systemDictionary.hpp" |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
30 |
#include "classfile/systemDictionaryShared.hpp" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
31 |
#include "logging/log.hpp" |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
32 |
#include "logging/logStream.hpp" |
20405 | 33 |
#include "memory/iterator.hpp" |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
34 |
#include "memory/metaspaceClosure.hpp" |
37248 | 35 |
#include "memory/resourceArea.hpp" |
7397 | 36 |
#include "oops/oop.inline.hpp" |
46729 | 37 |
#include "runtime/atomic.hpp" |
50429
83aec1d357d4
8204301: Make OrderAccess functions available to hpp rather than inline.hpp files
coleenp
parents:
50039
diff
changeset
|
38 |
#include "runtime/orderAccess.hpp" |
49594
898ef81cbc0e
8200106: Move NoSafepointVerifier out from gcLocker.hpp
stefank
parents:
49348
diff
changeset
|
39 |
#include "runtime/safepointVerifiers.hpp" |
7397 | 40 |
#include "utilities/hashtable.inline.hpp" |
1 | 41 |
|
47774 | 42 |
// Optimization: if any dictionary needs resizing, we set this flag, |
43 |
// so that we dont't have to walk all dictionaries to check if any actually |
|
44 |
// needs resizing, which is costly to do at Safepoint. |
|
45 |
bool Dictionary::_some_dictionary_needs_resizing = false; |
|
46 |
||
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
47 |
size_t Dictionary::entry_size() { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
48 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
49 |
return SystemDictionaryShared::dictionary_entry_size(); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
50 |
} else { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
51 |
return sizeof(DictionaryEntry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
52 |
} |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
53 |
} |
1 | 54 |
|
47774 | 55 |
Dictionary::Dictionary(ClassLoaderData* loader_data, int table_size, bool resizable) |
56 |
: _loader_data(loader_data), _resizable(resizable), _needs_resizing(false), |
|
57 |
Hashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size()) { |
|
1 | 58 |
}; |
59 |
||
60 |
||
46729 | 61 |
Dictionary::Dictionary(ClassLoaderData* loader_data, |
62 |
int table_size, HashtableBucket<mtClass>* t, |
|
47774 | 63 |
int number_of_entries, bool resizable) |
64 |
: _loader_data(loader_data), _resizable(resizable), _needs_resizing(false), |
|
65 |
Hashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size(), t, number_of_entries) { |
|
1 | 66 |
}; |
67 |
||
46729 | 68 |
Dictionary::~Dictionary() { |
69 |
DictionaryEntry* probe = NULL; |
|
70 |
for (int index = 0; index < table_size(); index++) { |
|
71 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
|
72 |
probe = *p; |
|
73 |
*p = probe->next(); |
|
74 |
free_entry(probe); |
|
75 |
} |
|
76 |
} |
|
77 |
assert(number_of_entries() == 0, "should have removed all entries"); |
|
78 |
assert(new_entry_free_list() == NULL, "entry present on Dictionary's free list"); |
|
79 |
free_buckets(); |
|
20405 | 80 |
} |
1 | 81 |
|
46729 | 82 |
DictionaryEntry* Dictionary::new_entry(unsigned int hash, InstanceKlass* klass) { |
83 |
DictionaryEntry* entry = (DictionaryEntry*)Hashtable<InstanceKlass*, mtClass>::allocate_new_entry(hash, klass); |
|
1 | 84 |
entry->set_pd_set(NULL); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
85 |
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
|
86 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
87 |
SystemDictionaryShared::init_shared_dictionary_entry(klass, entry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
88 |
} |
1 | 89 |
return entry; |
90 |
} |
|
91 |
||
92 |
||
93 |
void Dictionary::free_entry(DictionaryEntry* entry) { |
|
94 |
// avoid recursion when deleting linked list |
|
47098
e704f55561c3
8164207: Checking missing load-acquire in relation to _pd_set in dictionary.cpp
coleenp
parents:
46746
diff
changeset
|
95 |
// pd_set is accessed during a safepoint. |
1 | 96 |
while (entry->pd_set() != NULL) { |
97 |
ProtectionDomainEntry* to_delete = entry->pd_set(); |
|
98 |
entry->set_pd_set(to_delete->next()); |
|
99 |
delete to_delete; |
|
100 |
} |
|
46729 | 101 |
// Unlink from the Hashtable prior to freeing |
102 |
unlink_entry(entry); |
|
103 |
FREE_C_HEAP_ARRAY(char, entry); |
|
1 | 104 |
} |
105 |
||
47774 | 106 |
const int _resize_load_trigger = 5; // load factor that will trigger the resize |
107 |
const double _resize_factor = 2.0; // by how much we will resize using current number of entries |
|
108 |
const int _resize_max_size = 40423; // the max dictionary size allowed |
|
109 |
const int _primelist[] = {107, 1009, 2017, 4049, 5051, 10103, 20201, _resize_max_size}; |
|
110 |
const int _prime_array_size = sizeof(_primelist)/sizeof(int); |
|
111 |
||
112 |
// Calculate next "good" dictionary size based on requested count |
|
113 |
static int calculate_dictionary_size(int requested) { |
|
114 |
int newsize = _primelist[0]; |
|
115 |
int index = 0; |
|
116 |
for (newsize = _primelist[index]; index < (_prime_array_size - 1); |
|
117 |
newsize = _primelist[++index]) { |
|
118 |
if (requested <= newsize) { |
|
119 |
break; |
|
120 |
} |
|
121 |
} |
|
122 |
return newsize; |
|
123 |
} |
|
124 |
||
125 |
bool Dictionary::does_any_dictionary_needs_resizing() { |
|
126 |
return Dictionary::_some_dictionary_needs_resizing; |
|
127 |
} |
|
128 |
||
129 |
void Dictionary::check_if_needs_resize() { |
|
130 |
if (_resizable == true) { |
|
131 |
if (number_of_entries() > (_resize_load_trigger*table_size())) { |
|
132 |
_needs_resizing = true; |
|
133 |
Dictionary::_some_dictionary_needs_resizing = true; |
|
134 |
} |
|
135 |
} |
|
136 |
} |
|
137 |
||
138 |
bool Dictionary::resize_if_needed() { |
|
139 |
int desired_size = 0; |
|
140 |
if (_needs_resizing == true) { |
|
141 |
desired_size = calculate_dictionary_size((int)(_resize_factor*number_of_entries())); |
|
142 |
if (desired_size >= _resize_max_size) { |
|
143 |
desired_size = _resize_max_size; |
|
144 |
// We have reached the limit, turn resizing off |
|
145 |
_resizable = false; |
|
146 |
} |
|
147 |
if ((desired_size != 0) && (desired_size != table_size())) { |
|
148 |
if (!resize(desired_size)) { |
|
149 |
// Something went wrong, turn resizing off |
|
150 |
_resizable = false; |
|
151 |
} |
|
152 |
} |
|
153 |
} |
|
154 |
||
155 |
_needs_resizing = false; |
|
156 |
Dictionary::_some_dictionary_needs_resizing = false; |
|
157 |
||
158 |
return (desired_size != 0); |
|
159 |
} |
|
1 | 160 |
|
161 |
bool DictionaryEntry::contains_protection_domain(oop protection_domain) const { |
|
162 |
#ifdef ASSERT |
|
49658 | 163 |
if (oopDesc::equals(protection_domain, instance_klass()->protection_domain())) { |
1 | 164 |
// Ensure this doesn't show up in the pd_set (invariant) |
165 |
bool in_pd_set = false; |
|
47098
e704f55561c3
8164207: Checking missing load-acquire in relation to _pd_set in dictionary.cpp
coleenp
parents:
46746
diff
changeset
|
166 |
for (ProtectionDomainEntry* current = pd_set_acquire(); |
1 | 167 |
current != NULL; |
168 |
current = current->next()) { |
|
49658 | 169 |
if (oopDesc::equals(current->object_no_keepalive(), protection_domain)) { |
1 | 170 |
in_pd_set = true; |
171 |
break; |
|
172 |
} |
|
173 |
} |
|
174 |
if (in_pd_set) { |
|
175 |
assert(false, "A klass's protection domain should not show up " |
|
176 |
"in its sys. dict. PD set"); |
|
177 |
} |
|
178 |
} |
|
179 |
#endif /* ASSERT */ |
|
180 |
||
49658 | 181 |
if (oopDesc::equals(protection_domain, instance_klass()->protection_domain())) { |
1 | 182 |
// Succeeds trivially |
183 |
return true; |
|
184 |
} |
|
185 |
||
47098
e704f55561c3
8164207: Checking missing load-acquire in relation to _pd_set in dictionary.cpp
coleenp
parents:
46746
diff
changeset
|
186 |
for (ProtectionDomainEntry* current = pd_set_acquire(); |
1 | 187 |
current != NULL; |
188 |
current = current->next()) { |
|
49658 | 189 |
if (oopDesc::equals(current->object_no_keepalive(), protection_domain)) return true; |
1 | 190 |
} |
191 |
return false; |
|
192 |
} |
|
193 |
||
194 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
195 |
void DictionaryEntry::add_protection_domain(Dictionary* dict, Handle protection_domain) { |
1 | 196 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
197 |
if (!contains_protection_domain(protection_domain())) { |
46729 | 198 |
ProtectionDomainCacheEntry* entry = SystemDictionary::cache_get(protection_domain); |
1 | 199 |
ProtectionDomainEntry* new_head = |
47098
e704f55561c3
8164207: Checking missing load-acquire in relation to _pd_set in dictionary.cpp
coleenp
parents:
46746
diff
changeset
|
200 |
new ProtectionDomainEntry(entry, pd_set()); |
1 | 201 |
// Warning: Preserve store ordering. The SystemDictionary is read |
202 |
// without locks. The new ProtectionDomainEntry must be |
|
203 |
// complete before other threads can be allowed to see it |
|
204 |
// via a store to _pd_set. |
|
47098
e704f55561c3
8164207: Checking missing load-acquire in relation to _pd_set in dictionary.cpp
coleenp
parents:
46746
diff
changeset
|
205 |
release_set_pd_set(new_head); |
1 | 206 |
} |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
207 |
LogTarget(Trace, protectiondomain) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
208 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
209 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
210 |
print_count(&ls); |
1 | 211 |
} |
212 |
} |
|
213 |
||
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
214 |
// During class loading we may have cached a protection domain that has |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
215 |
// since been unreferenced, so this entry should be cleared. |
49818
e57e6addb978
8201505: Use WeakHandle for ProtectionDomainCacheTable and ResolvedMethodTable
coleenp
parents:
49658
diff
changeset
|
216 |
void Dictionary::clean_cached_protection_domains(DictionaryEntry* probe) { |
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
217 |
assert_locked_or_safepoint(SystemDictionary_lock); |
1 | 218 |
|
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
219 |
ProtectionDomainEntry* current = probe->pd_set(); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
220 |
ProtectionDomainEntry* prev = NULL; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
221 |
while (current != NULL) { |
49818
e57e6addb978
8201505: Use WeakHandle for ProtectionDomainCacheTable and ResolvedMethodTable
coleenp
parents:
49658
diff
changeset
|
222 |
if (current->object_no_keepalive() == NULL) { |
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
223 |
LogTarget(Debug, protectiondomain) lt; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
224 |
if (lt.is_enabled()) { |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
225 |
ResourceMark rm; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
226 |
// Print out trace information |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
227 |
LogStream ls(lt); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
228 |
ls.print_cr("PD in set is not alive:"); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
229 |
ls.print("class loader: "); loader_data()->class_loader()->print_value_on(&ls); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
230 |
ls.print(" loading: "); probe->instance_klass()->print_value_on(&ls); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
231 |
ls.cr(); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
232 |
} |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
233 |
if (probe->pd_set() == current) { |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
234 |
probe->set_pd_set(current->next()); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
235 |
} else { |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
236 |
assert(prev != NULL, "should be set by alive entry"); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
237 |
prev->set_next(current->next()); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
238 |
} |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
239 |
ProtectionDomainEntry* to_delete = current; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
240 |
current = current->next(); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
241 |
delete to_delete; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
242 |
} else { |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
243 |
prev = current; |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
244 |
current = current->next(); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
245 |
} |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
246 |
} |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
247 |
} |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
248 |
|
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
249 |
|
49818
e57e6addb978
8201505: Use WeakHandle for ProtectionDomainCacheTable and ResolvedMethodTable
coleenp
parents:
49658
diff
changeset
|
250 |
void Dictionary::do_unloading() { |
5402
c51fd0c1d005
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
2534
diff
changeset
|
251 |
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
1 | 252 |
|
46729 | 253 |
// The NULL class loader doesn't initiate loading classes from other class loaders |
254 |
if (loader_data() == ClassLoaderData::the_null_class_loader_data()) { |
|
255 |
return; |
|
256 |
} |
|
257 |
||
258 |
// Remove unloaded entries and classes from this dictionary |
|
1 | 259 |
DictionaryEntry* probe = NULL; |
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
260 |
for (int index = 0; index < table_size(); index++) { |
1 | 261 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
262 |
probe = *p; |
|
46729 | 263 |
InstanceKlass* ik = probe->instance_klass(); |
264 |
ClassLoaderData* k_def_class_loader_data = ik->class_loader_data(); |
|
1 | 265 |
|
46729 | 266 |
// If the klass that this loader initiated is dead, |
267 |
// (determined by checking the defining class loader) |
|
268 |
// remove this entry. |
|
269 |
if (k_def_class_loader_data->is_unloading()) { |
|
270 |
assert(k_def_class_loader_data != loader_data(), |
|
271 |
"cannot have live defining loader and unreachable klass"); |
|
272 |
*p = probe->next(); |
|
273 |
free_entry(probe); |
|
274 |
continue; |
|
1 | 275 |
} |
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
276 |
// Clean pd_set |
49818
e57e6addb978
8201505: Use WeakHandle for ProtectionDomainCacheTable and ResolvedMethodTable
coleenp
parents:
49658
diff
changeset
|
277 |
clean_cached_protection_domains(probe); |
1 | 278 |
p = probe->next_addr(); |
279 |
} |
|
280 |
} |
|
281 |
} |
|
282 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
283 |
void Dictionary::remove_classes_in_error_state() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
284 |
assert(DumpSharedSpaces, "supported only when dumping"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
285 |
DictionaryEntry* probe = NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
286 |
for (int index = 0; index < table_size(); index++) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
287 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
288 |
probe = *p; |
46729 | 289 |
InstanceKlass* ik = probe->instance_klass(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
290 |
if (ik->is_in_error_state()) { // purge this entry |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
291 |
*p = probe->next(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
292 |
free_entry(probe); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
293 |
ResourceMark rm; |
27618
790a8bf5488b
8064375: Change certain errors to warnings in CDS output.
jiangli
parents:
26181
diff
changeset
|
294 |
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
|
295 |
continue; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
296 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
297 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
298 |
p = probe->next_addr(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
299 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
300 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
301 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
302 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
303 |
// Just the classes from defining class loaders |
46729 | 304 |
void Dictionary::classes_do(void f(InstanceKlass*)) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
305 |
for (int index = 0; index < table_size(); index++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
306 |
for (DictionaryEntry* probe = bucket(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
307 |
probe != NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
308 |
probe = probe->next()) { |
46729 | 309 |
InstanceKlass* k = probe->instance_klass(); |
310 |
if (loader_data() == k->class_loader_data()) { |
|
1 | 311 |
f(k); |
312 |
} |
|
313 |
} |
|
314 |
} |
|
315 |
} |
|
316 |
||
317 |
// Added for initialize_itable_for_klass to handle exceptions |
|
318 |
// Just the classes from defining class loaders |
|
46729 | 319 |
void Dictionary::classes_do(void f(InstanceKlass*, TRAPS), TRAPS) { |
1 | 320 |
for (int index = 0; index < table_size(); index++) { |
321 |
for (DictionaryEntry* probe = bucket(index); |
|
322 |
probe != NULL; |
|
323 |
probe = probe->next()) { |
|
46729 | 324 |
InstanceKlass* k = probe->instance_klass(); |
325 |
if (loader_data() == k->class_loader_data()) { |
|
1 | 326 |
f(k, CHECK); |
327 |
} |
|
328 |
} |
|
329 |
} |
|
330 |
} |
|
331 |
||
46729 | 332 |
// All classes, and their class loaders, including initiating class loaders |
333 |
void Dictionary::all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) { |
|
1 | 334 |
for (int index = 0; index < table_size(); index++) { |
335 |
for (DictionaryEntry* probe = bucket(index); |
|
336 |
probe != NULL; |
|
337 |
probe = probe->next()) { |
|
46729 | 338 |
InstanceKlass* k = probe->instance_klass(); |
339 |
f(k, loader_data()); |
|
1 | 340 |
} |
341 |
} |
|
342 |
} |
|
343 |
||
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
344 |
// Used to scan and relocate the classes during CDS archive dump. |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
345 |
void Dictionary::classes_do(MetaspaceClosure* it) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
346 |
assert(DumpSharedSpaces, "dump-time only"); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
347 |
for (int index = 0; index < table_size(); index++) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
348 |
for (DictionaryEntry* probe = bucket(index); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
349 |
probe != NULL; |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
350 |
probe = probe->next()) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
351 |
it->push(probe->klass_addr()); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
352 |
((SharedDictionaryEntry*)probe)->metaspace_pointers_do(it); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
353 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
354 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
355 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
356 |
|
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
357 |
|
1 | 358 |
|
46729 | 359 |
// Add a loaded class to the dictionary. |
1 | 360 |
// Readers of the SystemDictionary aren't always locked, so _buckets |
361 |
// is volatile. The store of the next field in the constructor is |
|
362 |
// also cast to volatile; we do this to ensure store order is maintained |
|
363 |
// by the compilers. |
|
364 |
||
47774 | 365 |
void Dictionary::add_klass(unsigned int hash, Symbol* class_name, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
366 |
InstanceKlass* obj) { |
1 | 367 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
368 |
assert(obj != NULL, "adding NULL obj"); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
369 |
assert(obj->name() == class_name, "sanity check on name"); |
1 | 370 |
|
46729 | 371 |
DictionaryEntry* entry = new_entry(hash, obj); |
47774 | 372 |
int index = hash_to_index(hash); |
1 | 373 |
add_entry(index, entry); |
47774 | 374 |
check_if_needs_resize(); |
1 | 375 |
} |
376 |
||
377 |
||
46729 | 378 |
// This routine does not lock the dictionary. |
1 | 379 |
// |
380 |
// Since readers don't hold a lock, we must make sure that system |
|
381 |
// dictionary entries are only removed at a safepoint (when only one |
|
382 |
// thread is running), and are added to in a safe way (all links must |
|
383 |
// be updated in an MT-safe manner). |
|
384 |
// |
|
385 |
// Callers should be aware that an entry could be added just after |
|
386 |
// _buckets[index] is read here, so the caller will not see the new entry. |
|
387 |
DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash, |
|
46729 | 388 |
Symbol* class_name) { |
1 | 389 |
for (DictionaryEntry* entry = bucket(index); |
390 |
entry != NULL; |
|
391 |
entry = entry->next()) { |
|
46729 | 392 |
if (entry->hash() == hash && entry->equals(class_name)) { |
393 |
if (!DumpSharedSpaces || SystemDictionaryShared::is_builtin(entry)) { |
|
394 |
return entry; |
|
395 |
} |
|
1 | 396 |
} |
397 |
} |
|
398 |
return NULL; |
|
399 |
} |
|
400 |
||
401 |
||
47774 | 402 |
InstanceKlass* Dictionary::find(unsigned int hash, Symbol* name, |
46729 | 403 |
Handle protection_domain) { |
47774 | 404 |
NoSafepointVerifier nsv; |
405 |
||
406 |
int index = hash_to_index(hash); |
|
46729 | 407 |
DictionaryEntry* entry = get_entry(index, hash, name); |
1 | 408 |
if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { |
46729 | 409 |
return entry->instance_klass(); |
1 | 410 |
} else { |
411 |
return NULL; |
|
412 |
} |
|
413 |
} |
|
414 |
||
415 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
416 |
InstanceKlass* Dictionary::find_class(int index, unsigned int hash, |
46729 | 417 |
Symbol* name) { |
1 | 418 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46729 | 419 |
assert (index == index_for(name), "incorrect index?"); |
1 | 420 |
|
46729 | 421 |
DictionaryEntry* entry = get_entry(index, hash, name); |
422 |
return (entry != NULL) ? entry->instance_klass() : NULL; |
|
1 | 423 |
} |
424 |
||
425 |
||
426 |
// Variant of find_class for shared classes. No locking required, as |
|
427 |
// that table is static. |
|
428 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
429 |
InstanceKlass* Dictionary::find_shared_class(int index, unsigned int hash, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
430 |
Symbol* name) { |
46729 | 431 |
assert (index == index_for(name), "incorrect index?"); |
1 | 432 |
|
46729 | 433 |
DictionaryEntry* entry = get_entry(index, hash, name); |
434 |
return (entry != NULL) ? entry->instance_klass() : NULL; |
|
1 | 435 |
} |
436 |
||
437 |
||
438 |
void Dictionary::add_protection_domain(int index, unsigned int hash, |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
439 |
InstanceKlass* klass, |
46729 | 440 |
Handle protection_domain, |
1 | 441 |
TRAPS) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
442 |
Symbol* klass_name = klass->name(); |
46729 | 443 |
DictionaryEntry* entry = get_entry(index, hash, klass_name); |
1 | 444 |
|
445 |
assert(entry != NULL,"entry must be present, we just created it"); |
|
446 |
assert(protection_domain() != NULL, |
|
447 |
"real protection domain should be present"); |
|
448 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
449 |
entry->add_protection_domain(this, protection_domain); |
1 | 450 |
|
48811
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
451 |
#ifdef ASSERT |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
452 |
assert(loader_data() != ClassLoaderData::the_null_class_loader_data(), "doesn't make sense"); |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
453 |
#endif |
58787a1708d2
8175249: VMThread::run fails in VerifyBeforeExit : Universe::verify
coleenp
parents:
48781
diff
changeset
|
454 |
|
1 | 455 |
assert(entry->contains_protection_domain(protection_domain()), |
456 |
"now protection domain should be present"); |
|
457 |
} |
|
458 |
||
459 |
||
47774 | 460 |
bool Dictionary::is_valid_protection_domain(unsigned int hash, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
461 |
Symbol* name, |
1 | 462 |
Handle protection_domain) { |
47774 | 463 |
int index = hash_to_index(hash); |
46729 | 464 |
DictionaryEntry* entry = get_entry(index, hash, name); |
1 | 465 |
return entry->is_valid_protection_domain(protection_domain); |
466 |
} |
|
467 |
||
47761
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
468 |
#if INCLUDE_CDS |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
469 |
static bool is_jfr_event_class(Klass *k) { |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
470 |
while (k) { |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
471 |
if (k->name()->equals("jdk/jfr/Event")) { |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
472 |
return true; |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
473 |
} |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
474 |
k = k->super(); |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
475 |
} |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
476 |
return false; |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
477 |
} |
1 | 478 |
|
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
479 |
void Dictionary::reorder_dictionary_for_sharing() { |
1 | 480 |
|
481 |
// Copy all the dictionary entries into a single master list. |
|
49329 | 482 |
assert(DumpSharedSpaces, "Should only be used at dump time"); |
1 | 483 |
|
484 |
DictionaryEntry* master_list = NULL; |
|
485 |
for (int i = 0; i < table_size(); ++i) { |
|
486 |
DictionaryEntry* p = bucket(i); |
|
487 |
while (p != NULL) { |
|
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
488 |
DictionaryEntry* next = p->next(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
489 |
InstanceKlass*ik = p->instance_klass(); |
49329 | 490 |
if (ik->has_signer_and_not_archived()) { |
47761
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
491 |
// We cannot include signed classes in the archive because the certificates |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
492 |
// used during dump time may be different than those used during |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
493 |
// runtime (due to expiration, etc). |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
494 |
ResourceMark rm; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
495 |
tty->print_cr("Preload Warning: Skipping %s from signed JAR", |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
496 |
ik->name()->as_C_string()); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
497 |
free_entry(p); |
47761
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
498 |
} else if (is_jfr_event_class(ik)) { |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
499 |
// We cannot include JFR event classes because they need runtime-specific |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
500 |
// instrumentation in order to work with -XX:FlightRecorderOptions=retransform=false. |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
501 |
// There are only a small number of these classes, so it's not worthwhile to |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
502 |
// support them and make CDS more complicated. |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
503 |
ResourceMark rm; |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
504 |
tty->print_cr("Skipping JFR event class %s", ik->name()->as_C_string()); |
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
505 |
free_entry(p); |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
506 |
} else { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
507 |
p->set_next(master_list); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
508 |
master_list = p; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
509 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47098
diff
changeset
|
510 |
p = next; |
1 | 511 |
} |
512 |
set_entry(i, NULL); |
|
513 |
} |
|
514 |
||
515 |
// Add the dictionary entries back to the list in the correct buckets. |
|
516 |
while (master_list != NULL) { |
|
517 |
DictionaryEntry* p = master_list; |
|
518 |
master_list = master_list->next(); |
|
519 |
p->set_next(NULL); |
|
46729 | 520 |
Symbol* class_name = p->instance_klass()->name(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
521 |
// 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
|
522 |
// compute the hash with NULL for loader data. |
46729 | 523 |
unsigned int hash = compute_hash(class_name); |
1 | 524 |
int index = hash_to_index(hash); |
525 |
p->set_hash(hash); |
|
526 |
p->set_next(bucket(index)); |
|
527 |
set_entry(index, p); |
|
528 |
} |
|
529 |
} |
|
47761
1b0566927c7a
8190191: Subclasses of jdk.jfr.Event loaded from CDS breaks -XX:FlightRecorderOptions=retransform=false
iklam
parents:
47216
diff
changeset
|
530 |
#endif |
35498
392b50de06c6
8146401: Clean up oop.hpp: add inline directives and fix header files
goetz
parents:
34257
diff
changeset
|
531 |
|
2534 | 532 |
SymbolPropertyTable::SymbolPropertyTable(int table_size) |
13195 | 533 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry)) |
2534 | 534 |
{ |
535 |
} |
|
13195 | 536 |
SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, |
2534 | 537 |
int number_of_entries) |
13195 | 538 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) |
2534 | 539 |
{ |
540 |
} |
|
541 |
||
542 |
||
543 |
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
|
544 |
Symbol* sym, |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
545 |
intptr_t sym_mode) { |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
546 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
2534 | 547 |
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
|
548 |
if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { |
2534 | 549 |
return p; |
550 |
} |
|
551 |
} |
|
552 |
return NULL; |
|
553 |
} |
|
554 |
||
555 |
||
556 |
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
|
557 |
Symbol* sym, intptr_t sym_mode) { |
2534 | 558 |
assert_locked_or_safepoint(SystemDictionary_lock); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
559 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
560 |
assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); |
2534 | 561 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
562 |
SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); |
13195 | 563 |
Hashtable<Symbol*, mtSymbol>::add_entry(index, p); |
2534 | 564 |
return p; |
565 |
} |
|
566 |
||
567 |
void SymbolPropertyTable::oops_do(OopClosure* f) { |
|
568 |
for (int index = 0; index < table_size(); index++) { |
|
569 |
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
|
570 |
if (p->method_type() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
571 |
f->do_oop(p->method_type_addr()); |
2534 | 572 |
} |
573 |
} |
|
574 |
} |
|
575 |
} |
|
576 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
577 |
void SymbolPropertyTable::methods_do(void f(Method*)) { |
2534 | 578 |
for (int index = 0; index < table_size(); index++) { |
579 |
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
|
580 |
Method* prop = p->method(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
581 |
if (prop != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
582 |
f((Method*)prop); |
2534 | 583 |
} |
584 |
} |
|
585 |
} |
|
586 |
} |
|
587 |
||
1 | 588 |
|
589 |
// ---------------------------------------------------------------------------- |
|
590 |
||
46742 | 591 |
void Dictionary::print_on(outputStream* st) const { |
1 | 592 |
ResourceMark rm; |
593 |
||
46729 | 594 |
assert(loader_data() != NULL, "loader data should not be null"); |
46742 | 595 |
st->print_cr("Java dictionary (table_size=%d, classes=%d)", |
596 |
table_size(), number_of_entries()); |
|
597 |
st->print_cr("^ indicates that initiating loader is different from defining loader"); |
|
1 | 598 |
|
599 |
for (int index = 0; index < table_size(); index++) { |
|
600 |
for (DictionaryEntry* probe = bucket(index); |
|
601 |
probe != NULL; |
|
602 |
probe = probe->next()) { |
|
46729 | 603 |
Klass* e = probe->instance_klass(); |
1 | 604 |
bool is_defining_class = |
46729 | 605 |
(loader_data() == e->class_loader_data()); |
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
606 |
st->print("%4d: %s%s", index, is_defining_class ? " " : "^", e->external_name()); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
607 |
ClassLoaderData* cld = e->class_loader_data(); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
608 |
if (cld == NULL) { |
46742 | 609 |
// Shared class not restored yet in shared dictionary |
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
610 |
st->print(", loader data <shared, not restored>"); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
611 |
} else if (!loader_data()->is_the_null_class_loader_data()) { |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
612 |
// Class loader output for the dictionary for the null class loader data is |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
613 |
// redundant and obvious. |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
614 |
st->print(", "); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
615 |
cld->print_value_on(st); |
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
|
616 |
} |
46742 | 617 |
st->cr(); |
1 | 618 |
} |
619 |
} |
|
20405 | 620 |
tty->cr(); |
1 | 621 |
} |
622 |
||
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
623 |
void DictionaryEntry::verify() { |
46729 | 624 |
Klass* e = instance_klass(); |
625 |
guarantee(e->is_instance_klass(), |
|
626 |
"Verify of dictionary failed"); |
|
627 |
e->verify(); |
|
628 |
verify_protection_domain_set(); |
|
629 |
} |
|
630 |
||
631 |
void Dictionary::verify() { |
|
632 |
guarantee(number_of_entries() >= 0, "Verify of dictionary failed"); |
|
633 |
||
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
634 |
ClassLoaderData* cld = loader_data(); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
635 |
// class loader must be present; a null class loader is the |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
636 |
// boostrap loader |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
637 |
guarantee(cld != NULL || DumpSharedSpaces || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
638 |
cld->class_loader() == NULL || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
639 |
cld->class_loader()->is_instance(), |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
640 |
"checking type of class_loader"); |
46729 | 641 |
|
642 |
ResourceMark rm; |
|
643 |
stringStream tempst; |
|
644 |
tempst.print("System Dictionary for %s", cld->loader_name()); |
|
645 |
verify_table<DictionaryEntry>(tempst.as_string()); |
|
42073
89e056fd82cc
8166145: runtime/threads/ThreadInterruptTest3 fails with ExitCode 0
gziemski
parents:
39982
diff
changeset
|
646 |
} |