author | redestad |
Mon, 28 Aug 2017 00:20:35 +0200 | |
changeset 46994 | 7663ce98384b |
parent 46746 | ea379ebb9447 |
child 47098 | e704f55561c3 |
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" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
32 |
#include "logging/log.hpp" |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
33 |
#include "logging/logStream.hpp" |
20405 | 34 |
#include "memory/iterator.hpp" |
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
35 |
#include "memory/metaspaceClosure.hpp" |
37248 | 36 |
#include "memory/resourceArea.hpp" |
7397 | 37 |
#include "oops/oop.inline.hpp" |
46729 | 38 |
#include "runtime/atomic.hpp" |
24351
61b33cc6d3cf
8042195: Introduce umbrella header orderAccess.inline.hpp.
goetz
parents:
22794
diff
changeset
|
39 |
#include "runtime/orderAccess.inline.hpp" |
7397 | 40 |
#include "utilities/hashtable.inline.hpp" |
1 | 41 |
|
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
42 |
size_t Dictionary::entry_size() { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
43 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
44 |
return SystemDictionaryShared::dictionary_entry_size(); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
45 |
} else { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
46 |
return sizeof(DictionaryEntry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
47 |
} |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
48 |
} |
1 | 49 |
|
46729 | 50 |
Dictionary::Dictionary(ClassLoaderData* loader_data, int table_size) |
51 |
: _loader_data(loader_data), Hashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size()) { |
|
1 | 52 |
}; |
53 |
||
54 |
||
46729 | 55 |
Dictionary::Dictionary(ClassLoaderData* loader_data, |
56 |
int table_size, HashtableBucket<mtClass>* t, |
|
1 | 57 |
int number_of_entries) |
46729 | 58 |
: _loader_data(loader_data), Hashtable<InstanceKlass*, mtClass>(table_size, (int)entry_size(), t, number_of_entries) { |
1 | 59 |
}; |
60 |
||
46729 | 61 |
Dictionary::~Dictionary() { |
62 |
DictionaryEntry* probe = NULL; |
|
63 |
for (int index = 0; index < table_size(); index++) { |
|
64 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
|
65 |
probe = *p; |
|
66 |
*p = probe->next(); |
|
67 |
free_entry(probe); |
|
68 |
} |
|
69 |
} |
|
70 |
assert(number_of_entries() == 0, "should have removed all entries"); |
|
71 |
assert(new_entry_free_list() == NULL, "entry present on Dictionary's free list"); |
|
72 |
free_buckets(); |
|
20405 | 73 |
} |
1 | 74 |
|
46729 | 75 |
DictionaryEntry* Dictionary::new_entry(unsigned int hash, InstanceKlass* klass) { |
76 |
DictionaryEntry* entry = (DictionaryEntry*)Hashtable<InstanceKlass*, mtClass>::allocate_new_entry(hash, klass); |
|
1 | 77 |
entry->set_pd_set(NULL); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
78 |
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
|
79 |
if (DumpSharedSpaces) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
80 |
SystemDictionaryShared::init_shared_dictionary_entry(klass, entry); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33611
diff
changeset
|
81 |
} |
1 | 82 |
return entry; |
83 |
} |
|
84 |
||
85 |
||
86 |
void Dictionary::free_entry(DictionaryEntry* entry) { |
|
87 |
// avoid recursion when deleting linked list |
|
88 |
while (entry->pd_set() != NULL) { |
|
89 |
ProtectionDomainEntry* to_delete = entry->pd_set(); |
|
90 |
entry->set_pd_set(to_delete->next()); |
|
91 |
delete to_delete; |
|
92 |
} |
|
46729 | 93 |
// Unlink from the Hashtable prior to freeing |
94 |
unlink_entry(entry); |
|
95 |
FREE_C_HEAP_ARRAY(char, entry); |
|
1 | 96 |
} |
97 |
||
98 |
||
99 |
bool DictionaryEntry::contains_protection_domain(oop protection_domain) const { |
|
100 |
#ifdef ASSERT |
|
46729 | 101 |
if (protection_domain == instance_klass()->protection_domain()) { |
1 | 102 |
// Ensure this doesn't show up in the pd_set (invariant) |
103 |
bool in_pd_set = false; |
|
104 |
for (ProtectionDomainEntry* current = _pd_set; |
|
105 |
current != NULL; |
|
106 |
current = current->next()) { |
|
107 |
if (current->protection_domain() == protection_domain) { |
|
108 |
in_pd_set = true; |
|
109 |
break; |
|
110 |
} |
|
111 |
} |
|
112 |
if (in_pd_set) { |
|
113 |
assert(false, "A klass's protection domain should not show up " |
|
114 |
"in its sys. dict. PD set"); |
|
115 |
} |
|
116 |
} |
|
117 |
#endif /* ASSERT */ |
|
118 |
||
46729 | 119 |
if (protection_domain == instance_klass()->protection_domain()) { |
1 | 120 |
// Succeeds trivially |
121 |
return true; |
|
122 |
} |
|
123 |
||
124 |
for (ProtectionDomainEntry* current = _pd_set; |
|
125 |
current != NULL; |
|
126 |
current = current->next()) { |
|
127 |
if (current->protection_domain() == protection_domain) return true; |
|
128 |
} |
|
129 |
return false; |
|
130 |
} |
|
131 |
||
132 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
133 |
void DictionaryEntry::add_protection_domain(Dictionary* dict, Handle protection_domain) { |
1 | 134 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
135 |
if (!contains_protection_domain(protection_domain())) { |
46729 | 136 |
ProtectionDomainCacheEntry* entry = SystemDictionary::cache_get(protection_domain); |
1 | 137 |
ProtectionDomainEntry* new_head = |
20405 | 138 |
new ProtectionDomainEntry(entry, _pd_set); |
1 | 139 |
// Warning: Preserve store ordering. The SystemDictionary is read |
140 |
// without locks. The new ProtectionDomainEntry must be |
|
141 |
// complete before other threads can be allowed to see it |
|
142 |
// via a store to _pd_set. |
|
143 |
OrderAccess::release_store_ptr(&_pd_set, new_head); |
|
144 |
} |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
145 |
LogTarget(Trace, protectiondomain) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
146 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
147 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46475
diff
changeset
|
148 |
print_count(&ls); |
1 | 149 |
} |
150 |
} |
|
151 |
||
152 |
||
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
153 |
void Dictionary::do_unloading() { |
5402
c51fd0c1d005
6888953: some calls to function-like macros are missing semicolons
jcoomes
parents:
2534
diff
changeset
|
154 |
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
1 | 155 |
|
46729 | 156 |
// The NULL class loader doesn't initiate loading classes from other class loaders |
157 |
if (loader_data() == ClassLoaderData::the_null_class_loader_data()) { |
|
158 |
return; |
|
159 |
} |
|
160 |
||
161 |
// Remove unloaded entries and classes from this dictionary |
|
1 | 162 |
DictionaryEntry* probe = NULL; |
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
163 |
for (int index = 0; index < table_size(); index++) { |
1 | 164 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
165 |
probe = *p; |
|
46729 | 166 |
InstanceKlass* ik = probe->instance_klass(); |
167 |
ClassLoaderData* k_def_class_loader_data = ik->class_loader_data(); |
|
1 | 168 |
|
46729 | 169 |
// If the klass that this loader initiated is dead, |
170 |
// (determined by checking the defining class loader) |
|
171 |
// remove this entry. |
|
172 |
if (k_def_class_loader_data->is_unloading()) { |
|
173 |
assert(k_def_class_loader_data != loader_data(), |
|
174 |
"cannot have live defining loader and unreachable klass"); |
|
175 |
*p = probe->next(); |
|
176 |
free_entry(probe); |
|
177 |
continue; |
|
1 | 178 |
} |
179 |
p = probe->next_addr(); |
|
180 |
} |
|
181 |
} |
|
182 |
} |
|
183 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
184 |
void Dictionary::remove_classes_in_error_state() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
185 |
assert(DumpSharedSpaces, "supported only when dumping"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
186 |
DictionaryEntry* probe = NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
187 |
for (int index = 0; index < table_size(); index++) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
188 |
for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
189 |
probe = *p; |
46729 | 190 |
InstanceKlass* ik = probe->instance_klass(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
191 |
if (ik->is_in_error_state()) { // purge this entry |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
192 |
*p = probe->next(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
193 |
free_entry(probe); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
194 |
ResourceMark rm; |
27618
790a8bf5488b
8064375: Change certain errors to warnings in CDS output.
jiangli
parents:
26181
diff
changeset
|
195 |
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
|
196 |
continue; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
197 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
198 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
199 |
p = probe->next_addr(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
200 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
201 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
202 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
203 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
204 |
// Just the classes from defining class loaders |
46729 | 205 |
void Dictionary::classes_do(void f(InstanceKlass*)) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
206 |
for (int index = 0; index < table_size(); index++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
207 |
for (DictionaryEntry* probe = bucket(index); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
208 |
probe != NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
209 |
probe = probe->next()) { |
46729 | 210 |
InstanceKlass* k = probe->instance_klass(); |
211 |
if (loader_data() == k->class_loader_data()) { |
|
1 | 212 |
f(k); |
213 |
} |
|
214 |
} |
|
215 |
} |
|
216 |
} |
|
217 |
||
218 |
// Added for initialize_itable_for_klass to handle exceptions |
|
219 |
// Just the classes from defining class loaders |
|
46729 | 220 |
void Dictionary::classes_do(void f(InstanceKlass*, TRAPS), TRAPS) { |
1 | 221 |
for (int index = 0; index < table_size(); index++) { |
222 |
for (DictionaryEntry* probe = bucket(index); |
|
223 |
probe != NULL; |
|
224 |
probe = probe->next()) { |
|
46729 | 225 |
InstanceKlass* k = probe->instance_klass(); |
226 |
if (loader_data() == k->class_loader_data()) { |
|
1 | 227 |
f(k, CHECK); |
228 |
} |
|
229 |
} |
|
230 |
} |
|
231 |
} |
|
232 |
||
46729 | 233 |
// All classes, and their class loaders, including initiating class loaders |
234 |
void Dictionary::all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) { |
|
1 | 235 |
for (int index = 0; index < table_size(); index++) { |
236 |
for (DictionaryEntry* probe = bucket(index); |
|
237 |
probe != NULL; |
|
238 |
probe = probe->next()) { |
|
46729 | 239 |
InstanceKlass* k = probe->instance_klass(); |
240 |
f(k, loader_data()); |
|
1 | 241 |
} |
242 |
} |
|
243 |
} |
|
244 |
||
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
245 |
// 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
|
246 |
void Dictionary::classes_do(MetaspaceClosure* it) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
247 |
assert(DumpSharedSpaces, "dump-time only"); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
248 |
for (int index = 0; index < table_size(); index++) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
249 |
for (DictionaryEntry* probe = bucket(index); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
250 |
probe != NULL; |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
251 |
probe = probe->next()) { |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
252 |
it->push(probe->klass_addr()); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
253 |
((SharedDictionaryEntry*)probe)->metaspace_pointers_do(it); |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
254 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
255 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
256 |
} |
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
257 |
|
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
258 |
|
1 | 259 |
|
46729 | 260 |
// Add a loaded class to the dictionary. |
1 | 261 |
// Readers of the SystemDictionary aren't always locked, so _buckets |
262 |
// is volatile. The store of the next field in the constructor is |
|
263 |
// also cast to volatile; we do this to ensure store order is maintained |
|
264 |
// by the compilers. |
|
265 |
||
46729 | 266 |
void Dictionary::add_klass(int index, unsigned int hash, Symbol* class_name, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
267 |
InstanceKlass* obj) { |
1 | 268 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
269 |
assert(obj != NULL, "adding NULL obj"); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
270 |
assert(obj->name() == class_name, "sanity check on name"); |
1 | 271 |
|
46729 | 272 |
DictionaryEntry* entry = new_entry(hash, obj); |
1 | 273 |
add_entry(index, entry); |
274 |
} |
|
275 |
||
276 |
||
46729 | 277 |
// This routine does not lock the dictionary. |
1 | 278 |
// |
279 |
// Since readers don't hold a lock, we must make sure that system |
|
280 |
// dictionary entries are only removed at a safepoint (when only one |
|
281 |
// thread is running), and are added to in a safe way (all links must |
|
282 |
// be updated in an MT-safe manner). |
|
283 |
// |
|
284 |
// Callers should be aware that an entry could be added just after |
|
285 |
// _buckets[index] is read here, so the caller will not see the new entry. |
|
286 |
DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash, |
|
46729 | 287 |
Symbol* class_name) { |
1 | 288 |
for (DictionaryEntry* entry = bucket(index); |
289 |
entry != NULL; |
|
290 |
entry = entry->next()) { |
|
46729 | 291 |
if (entry->hash() == hash && entry->equals(class_name)) { |
292 |
if (!DumpSharedSpaces || SystemDictionaryShared::is_builtin(entry)) { |
|
293 |
return entry; |
|
294 |
} |
|
1 | 295 |
} |
296 |
} |
|
297 |
return NULL; |
|
298 |
} |
|
299 |
||
300 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
301 |
InstanceKlass* Dictionary::find(int index, unsigned int hash, Symbol* name, |
46729 | 302 |
Handle protection_domain) { |
303 |
DictionaryEntry* entry = get_entry(index, hash, name); |
|
1 | 304 |
if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) { |
46729 | 305 |
return entry->instance_klass(); |
1 | 306 |
} else { |
307 |
return NULL; |
|
308 |
} |
|
309 |
} |
|
310 |
||
311 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
312 |
InstanceKlass* Dictionary::find_class(int index, unsigned int hash, |
46729 | 313 |
Symbol* name) { |
1 | 314 |
assert_locked_or_safepoint(SystemDictionary_lock); |
46729 | 315 |
assert (index == index_for(name), "incorrect index?"); |
1 | 316 |
|
46729 | 317 |
DictionaryEntry* entry = get_entry(index, hash, name); |
318 |
return (entry != NULL) ? entry->instance_klass() : NULL; |
|
1 | 319 |
} |
320 |
||
321 |
||
322 |
// Variant of find_class for shared classes. No locking required, as |
|
323 |
// that table is static. |
|
324 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
325 |
InstanceKlass* Dictionary::find_shared_class(int index, unsigned int hash, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
326 |
Symbol* name) { |
46729 | 327 |
assert (index == index_for(name), "incorrect index?"); |
1 | 328 |
|
46729 | 329 |
DictionaryEntry* entry = get_entry(index, hash, name); |
330 |
return (entry != NULL) ? entry->instance_klass() : NULL; |
|
1 | 331 |
} |
332 |
||
333 |
||
334 |
void Dictionary::add_protection_domain(int index, unsigned int hash, |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46274
diff
changeset
|
335 |
InstanceKlass* klass, |
46729 | 336 |
Handle protection_domain, |
1 | 337 |
TRAPS) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
338 |
Symbol* klass_name = klass->name(); |
46729 | 339 |
DictionaryEntry* entry = get_entry(index, hash, klass_name); |
1 | 340 |
|
341 |
assert(entry != NULL,"entry must be present, we just created it"); |
|
342 |
assert(protection_domain() != NULL, |
|
343 |
"real protection domain should be present"); |
|
344 |
||
46274
534d019edb92
8175104: Unhandled oop in ProtectionDomainCacheTable::compute_hash
coleenp
parents:
46271
diff
changeset
|
345 |
entry->add_protection_domain(this, protection_domain); |
1 | 346 |
|
347 |
assert(entry->contains_protection_domain(protection_domain()), |
|
348 |
"now protection domain should be present"); |
|
349 |
} |
|
350 |
||
351 |
||
352 |
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
|
353 |
Symbol* name, |
1 | 354 |
Handle protection_domain) { |
46729 | 355 |
DictionaryEntry* entry = get_entry(index, hash, name); |
1 | 356 |
return entry->is_valid_protection_domain(protection_domain); |
357 |
} |
|
358 |
||
359 |
||
46746
ea379ebb9447
8072061: Automatically determine optimal sizes for the CDS regions
iklam
parents:
46742
diff
changeset
|
360 |
void Dictionary::reorder_dictionary_for_sharing() { |
1 | 361 |
|
362 |
// Copy all the dictionary entries into a single master list. |
|
363 |
||
364 |
DictionaryEntry* master_list = NULL; |
|
365 |
for (int i = 0; i < table_size(); ++i) { |
|
366 |
DictionaryEntry* p = bucket(i); |
|
367 |
while (p != NULL) { |
|
368 |
DictionaryEntry* tmp; |
|
369 |
tmp = p->next(); |
|
370 |
p->set_next(master_list); |
|
371 |
master_list = p; |
|
372 |
p = tmp; |
|
373 |
} |
|
374 |
set_entry(i, NULL); |
|
375 |
} |
|
376 |
||
377 |
// Add the dictionary entries back to the list in the correct buckets. |
|
378 |
while (master_list != NULL) { |
|
379 |
DictionaryEntry* p = master_list; |
|
380 |
master_list = master_list->next(); |
|
381 |
p->set_next(NULL); |
|
46729 | 382 |
Symbol* class_name = p->instance_klass()->name(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
383 |
// 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
|
384 |
// compute the hash with NULL for loader data. |
46729 | 385 |
unsigned int hash = compute_hash(class_name); |
1 | 386 |
int index = hash_to_index(hash); |
387 |
p->set_hash(hash); |
|
388 |
p->set_next(bucket(index)); |
|
389 |
set_entry(index, p); |
|
390 |
} |
|
391 |
} |
|
392 |
||
35498
392b50de06c6
8146401: Clean up oop.hpp: add inline directives and fix header files
goetz
parents:
34257
diff
changeset
|
393 |
|
2534 | 394 |
SymbolPropertyTable::SymbolPropertyTable(int table_size) |
13195 | 395 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry)) |
2534 | 396 |
{ |
397 |
} |
|
13195 | 398 |
SymbolPropertyTable::SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, |
2534 | 399 |
int number_of_entries) |
13195 | 400 |
: Hashtable<Symbol*, mtSymbol>(table_size, sizeof(SymbolPropertyEntry), t, number_of_entries) |
2534 | 401 |
{ |
402 |
} |
|
403 |
||
404 |
||
405 |
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
|
406 |
Symbol* sym, |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
407 |
intptr_t sym_mode) { |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
408 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
2534 | 409 |
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
|
410 |
if (p->hash() == hash && p->symbol() == sym && p->symbol_mode() == sym_mode) { |
2534 | 411 |
return p; |
412 |
} |
|
413 |
} |
|
414 |
return NULL; |
|
415 |
} |
|
416 |
||
417 |
||
418 |
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
|
419 |
Symbol* sym, intptr_t sym_mode) { |
2534 | 420 |
assert_locked_or_safepoint(SystemDictionary_lock); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
421 |
assert(index == index_for(sym, sym_mode), "incorrect index?"); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
422 |
assert(find_entry(index, hash, sym, sym_mode) == NULL, "no double entry"); |
2534 | 423 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
424 |
SymbolPropertyEntry* p = new_entry(hash, sym, sym_mode); |
13195 | 425 |
Hashtable<Symbol*, mtSymbol>::add_entry(index, p); |
2534 | 426 |
return p; |
427 |
} |
|
428 |
||
429 |
void SymbolPropertyTable::oops_do(OopClosure* f) { |
|
430 |
for (int index = 0; index < table_size(); index++) { |
|
431 |
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
|
432 |
if (p->method_type() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
433 |
f->do_oop(p->method_type_addr()); |
2534 | 434 |
} |
435 |
} |
|
436 |
} |
|
437 |
} |
|
438 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
439 |
void SymbolPropertyTable::methods_do(void f(Method*)) { |
2534 | 440 |
for (int index = 0; index < table_size(); index++) { |
441 |
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
|
442 |
Method* prop = p->method(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
443 |
if (prop != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
444 |
f((Method*)prop); |
2534 | 445 |
} |
446 |
} |
|
447 |
} |
|
448 |
} |
|
449 |
||
1 | 450 |
|
451 |
// ---------------------------------------------------------------------------- |
|
452 |
||
46742 | 453 |
void Dictionary::print_on(outputStream* st) const { |
1 | 454 |
ResourceMark rm; |
455 |
||
46729 | 456 |
assert(loader_data() != NULL, "loader data should not be null"); |
46742 | 457 |
st->print_cr("Java dictionary (table_size=%d, classes=%d)", |
458 |
table_size(), number_of_entries()); |
|
459 |
st->print_cr("^ indicates that initiating loader is different from defining loader"); |
|
1 | 460 |
|
461 |
for (int index = 0; index < table_size(); index++) { |
|
462 |
for (DictionaryEntry* probe = bucket(index); |
|
463 |
probe != NULL; |
|
464 |
probe = probe->next()) { |
|
46729 | 465 |
Klass* e = probe->instance_klass(); |
1 | 466 |
bool is_defining_class = |
46729 | 467 |
(loader_data() == e->class_loader_data()); |
46742 | 468 |
st->print("%4d: %s%s, loader ", index, is_defining_class ? " " : "^", e->external_name()); |
469 |
ClassLoaderData* loader_data = e->class_loader_data(); |
|
470 |
if (loader_data == NULL) { |
|
471 |
// Shared class not restored yet in shared dictionary |
|
472 |
st->print("<shared, not restored>"); |
|
473 |
} else { |
|
474 |
loader_data->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
|
475 |
} |
46742 | 476 |
st->cr(); |
1 | 477 |
} |
478 |
} |
|
20405 | 479 |
tty->cr(); |
1 | 480 |
} |
481 |
||
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
482 |
void DictionaryEntry::verify() { |
46729 | 483 |
Klass* e = instance_klass(); |
484 |
guarantee(e->is_instance_klass(), |
|
485 |
"Verify of dictionary failed"); |
|
486 |
e->verify(); |
|
487 |
verify_protection_domain_set(); |
|
488 |
} |
|
489 |
||
490 |
void Dictionary::verify() { |
|
491 |
guarantee(number_of_entries() >= 0, "Verify of dictionary failed"); |
|
492 |
||
46475
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
493 |
ClassLoaderData* cld = loader_data(); |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
494 |
// class loader must be present; a null class loader is the |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
495 |
// boostrap loader |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
496 |
guarantee(cld != NULL || DumpSharedSpaces || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
497 |
cld->class_loader() == NULL || |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
498 |
cld->class_loader()->is_instance(), |
75902cea18af
8166848: Performance bug: SystemDictionary - optimization
coleenp
parents:
46382
diff
changeset
|
499 |
"checking type of class_loader"); |
46729 | 500 |
|
501 |
ResourceMark rm; |
|
502 |
stringStream tempst; |
|
503 |
tempst.print("System Dictionary for %s", cld->loader_name()); |
|
504 |
verify_table<DictionaryEntry>(tempst.as_string()); |
|
42073
89e056fd82cc
8166145: runtime/threads/ThreadInterruptTest3 fails with ExitCode 0
gziemski
parents:
39982
diff
changeset
|
505 |
} |