author | iklam |
Tue, 18 Aug 2015 11:27:23 -0700 | |
changeset 34257 | 4be3504cc03b |
parent 33602 | 16053580a684 |
child 34666 | 1c7168ea0034 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
26181
diff
changeset
|
2 |
* Copyright (c) 2003, 2015, 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:
5420
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
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:
5420
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#ifndef SHARE_VM_CLASSFILE_DICTIONARY_HPP |
26 |
#define SHARE_VM_CLASSFILE_DICTIONARY_HPP |
|
27 |
||
28 |
#include "classfile/systemDictionary.hpp" |
|
29 |
#include "oops/instanceKlass.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
26181
diff
changeset
|
30 |
#include "oops/oop.hpp" |
7397 | 31 |
#include "utilities/hashtable.hpp" |
32 |
||
1 | 33 |
class DictionaryEntry; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
34 |
class PSPromotionManager; |
20405 | 35 |
class ProtectionDomainCacheTable; |
36 |
class ProtectionDomainCacheEntry; |
|
37 |
class BoolObjectClosure; |
|
1 | 38 |
|
39 |
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
40 |
// The data structure for the system dictionary (and the shared system |
|
41 |
// dictionary). |
|
42 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
43 |
class Dictionary : public TwoOopHashtable<Klass*, mtClass> { |
1 | 44 |
friend class VMStructs; |
45 |
private: |
|
46 |
// current iteration index. |
|
47 |
static int _current_class_index; |
|
48 |
// pointer to the current hash table entry. |
|
49 |
static DictionaryEntry* _current_class_entry; |
|
50 |
||
20405 | 51 |
ProtectionDomainCacheTable* _pd_cache_table; |
52 |
||
1 | 53 |
DictionaryEntry* get_entry(int index, unsigned int hash, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
54 |
Symbol* name, ClassLoaderData* loader_data); |
1 | 55 |
|
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33602
diff
changeset
|
56 |
protected: |
1 | 57 |
DictionaryEntry* bucket(int i) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
58 |
return (DictionaryEntry*)Hashtable<Klass*, mtClass>::bucket(i); |
1 | 59 |
} |
60 |
||
61 |
// The following method is not MT-safe and must be done under lock. |
|
62 |
DictionaryEntry** bucket_addr(int i) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
63 |
return (DictionaryEntry**)Hashtable<Klass*, mtClass>::bucket_addr(i); |
1 | 64 |
} |
65 |
||
66 |
void add_entry(int index, DictionaryEntry* new_entry) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
67 |
Hashtable<Klass*, mtClass>::add_entry(index, (HashtableEntry<Klass*, mtClass>*)new_entry); |
1 | 68 |
} |
69 |
||
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33602
diff
changeset
|
70 |
static size_t entry_size(); |
1 | 71 |
public: |
72 |
Dictionary(int table_size); |
|
13195 | 73 |
Dictionary(int table_size, HashtableBucket<mtClass>* t, int number_of_entries); |
1 | 74 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
75 |
DictionaryEntry* new_entry(unsigned int hash, Klass* klass, ClassLoaderData* loader_data); |
1 | 76 |
|
77 |
DictionaryEntry* new_entry(); |
|
78 |
||
79 |
void free_entry(DictionaryEntry* entry); |
|
80 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
81 |
void add_klass(Symbol* class_name, ClassLoaderData* loader_data,KlassHandle obj); |
1 | 82 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
83 |
Klass* find_class(int index, unsigned int hash, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
84 |
Symbol* name, ClassLoaderData* loader_data); |
1 | 85 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
86 |
Klass* find_shared_class(int index, unsigned int hash, Symbol* name); |
1 | 87 |
|
88 |
// Compiler support |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
89 |
Klass* try_get_next_class(); |
1 | 90 |
|
91 |
// GC support |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
92 |
void oops_do(OopClosure* f); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
93 |
void always_strong_oops_do(OopClosure* blk); |
25492
d27050bdfb04
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
25491
diff
changeset
|
94 |
void roots_oops_do(OopClosure* strong, OopClosure* weak); |
1 | 95 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
96 |
void always_strong_classes_do(KlassClosure* closure); |
1 | 97 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
98 |
void classes_do(void f(Klass*)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
99 |
void classes_do(void f(Klass*, TRAPS), TRAPS); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
100 |
void classes_do(void f(Klass*, ClassLoaderData*)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
101 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
102 |
void methods_do(void f(Method*)); |
1 | 103 |
|
20405 | 104 |
void unlink(BoolObjectClosure* is_alive); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
105 |
void remove_classes_in_error_state(); |
1 | 106 |
|
107 |
// Classes loaded by the bootstrap loader are always strongly reachable. |
|
108 |
// If we're not doing class unloading, all classes are strongly reachable. |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
109 |
static bool is_strongly_reachable(ClassLoaderData* loader_data, Klass* klass) { |
1 | 110 |
assert (klass != NULL, "should have non-null klass"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
111 |
return (loader_data->is_the_null_class_loader_data() || !ClassUnloading); |
1 | 112 |
} |
113 |
||
26174
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
114 |
// Unload (that is, break root links to) all unmarked classes and loaders. |
ca46a107cb78
8054402: "klass->is_loader_alive(_is_alive)) failed: must be alive" for anonymous classes
thartmann
parents:
25492
diff
changeset
|
115 |
void do_unloading(); |
1 | 116 |
|
117 |
// Protection domains |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
118 |
Klass* find(int index, unsigned int hash, Symbol* name, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
119 |
ClassLoaderData* loader_data, Handle protection_domain, TRAPS); |
1 | 120 |
bool is_valid_protection_domain(int index, unsigned int hash, |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
121 |
Symbol* name, ClassLoaderData* loader_data, |
1 | 122 |
Handle protection_domain); |
123 |
void add_protection_domain(int index, unsigned int hash, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
124 |
instanceKlassHandle klass, ClassLoaderData* loader_data, |
1 | 125 |
Handle protection_domain, TRAPS); |
126 |
||
127 |
// Sharing support |
|
128 |
void reorder_dictionary(); |
|
129 |
||
20405 | 130 |
ProtectionDomainCacheEntry* cache_get(oop protection_domain); |
1 | 131 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25492
diff
changeset
|
132 |
void print(bool details = true); |
1 | 133 |
void verify(); |
134 |
}; |
|
135 |
||
136 |
// The following classes can be in dictionary.cpp, but we need these |
|
20405 | 137 |
// to be in header file so that SA's vmStructs can access them. |
138 |
class ProtectionDomainCacheEntry : public HashtableEntry<oop, mtClass> { |
|
139 |
friend class VMStructs; |
|
140 |
private: |
|
141 |
// Flag indicating whether this protection domain entry is strongly reachable. |
|
142 |
// Used during iterating over the system dictionary to remember oops that need |
|
143 |
// to be updated. |
|
144 |
bool _strongly_reachable; |
|
145 |
public: |
|
146 |
oop protection_domain() { return literal(); } |
|
147 |
||
148 |
void init() { |
|
149 |
_strongly_reachable = false; |
|
150 |
} |
|
151 |
||
152 |
ProtectionDomainCacheEntry* next() { |
|
153 |
return (ProtectionDomainCacheEntry*)HashtableEntry<oop, mtClass>::next(); |
|
154 |
} |
|
155 |
||
156 |
ProtectionDomainCacheEntry** next_addr() { |
|
157 |
return (ProtectionDomainCacheEntry**)HashtableEntry<oop, mtClass>::next_addr(); |
|
158 |
} |
|
159 |
||
160 |
void oops_do(OopClosure* f) { |
|
161 |
f->do_oop(literal_addr()); |
|
162 |
} |
|
163 |
||
164 |
void set_strongly_reachable() { _strongly_reachable = true; } |
|
165 |
bool is_strongly_reachable() { return _strongly_reachable; } |
|
166 |
void reset_strongly_reachable() { _strongly_reachable = false; } |
|
167 |
||
168 |
void print() PRODUCT_RETURN; |
|
169 |
void verify(); |
|
170 |
}; |
|
171 |
||
172 |
// The ProtectionDomainCacheTable contains all protection domain oops. The system |
|
173 |
// dictionary entries reference its entries instead of having references to oops |
|
174 |
// directly. |
|
175 |
// This is used to speed up system dictionary iteration: the oops in the |
|
176 |
// protection domain are the only ones referring the Java heap. So when there is |
|
177 |
// need to update these, instead of going over every entry of the system dictionary, |
|
178 |
// we only need to iterate over this set. |
|
179 |
// The amount of different protection domains used is typically magnitudes smaller |
|
180 |
// than the number of system dictionary entries (loaded classes). |
|
181 |
class ProtectionDomainCacheTable : public Hashtable<oop, mtClass> { |
|
182 |
friend class VMStructs; |
|
183 |
private: |
|
184 |
ProtectionDomainCacheEntry* bucket(int i) { |
|
185 |
return (ProtectionDomainCacheEntry*) Hashtable<oop, mtClass>::bucket(i); |
|
186 |
} |
|
187 |
||
188 |
// The following method is not MT-safe and must be done under lock. |
|
189 |
ProtectionDomainCacheEntry** bucket_addr(int i) { |
|
190 |
return (ProtectionDomainCacheEntry**) Hashtable<oop, mtClass>::bucket_addr(i); |
|
191 |
} |
|
192 |
||
193 |
ProtectionDomainCacheEntry* new_entry(unsigned int hash, oop protection_domain) { |
|
194 |
ProtectionDomainCacheEntry* entry = (ProtectionDomainCacheEntry*) Hashtable<oop, mtClass>::new_entry(hash, protection_domain); |
|
195 |
entry->init(); |
|
196 |
return entry; |
|
197 |
} |
|
198 |
||
199 |
static unsigned int compute_hash(oop protection_domain) { |
|
200 |
return (unsigned int)(protection_domain->identity_hash()); |
|
201 |
} |
|
202 |
||
203 |
int index_for(oop protection_domain) { |
|
204 |
return hash_to_index(compute_hash(protection_domain)); |
|
205 |
} |
|
206 |
||
207 |
ProtectionDomainCacheEntry* add_entry(int index, unsigned int hash, oop protection_domain); |
|
208 |
ProtectionDomainCacheEntry* find_entry(int index, oop protection_domain); |
|
209 |
||
210 |
public: |
|
211 |
||
212 |
ProtectionDomainCacheTable(int table_size); |
|
213 |
||
214 |
ProtectionDomainCacheEntry* get(oop protection_domain); |
|
215 |
void free(ProtectionDomainCacheEntry* entry); |
|
216 |
||
217 |
void unlink(BoolObjectClosure* cl); |
|
218 |
||
219 |
// GC support |
|
220 |
void oops_do(OopClosure* f); |
|
221 |
void always_strong_oops_do(OopClosure* f); |
|
25492
d27050bdfb04
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
25491
diff
changeset
|
222 |
void roots_oops_do(OopClosure* strong, OopClosure* weak); |
20405 | 223 |
|
224 |
static uint bucket_size(); |
|
225 |
||
226 |
void print() PRODUCT_RETURN; |
|
227 |
void verify(); |
|
228 |
}; |
|
229 |
||
1 | 230 |
|
13195 | 231 |
class ProtectionDomainEntry :public CHeapObj<mtClass> { |
1 | 232 |
friend class VMStructs; |
233 |
public: |
|
234 |
ProtectionDomainEntry* _next; |
|
20405 | 235 |
ProtectionDomainCacheEntry* _pd_cache; |
1 | 236 |
|
20405 | 237 |
ProtectionDomainEntry(ProtectionDomainCacheEntry* pd_cache, ProtectionDomainEntry* next) { |
238 |
_pd_cache = pd_cache; |
|
239 |
_next = next; |
|
1 | 240 |
} |
241 |
||
242 |
ProtectionDomainEntry* next() { return _next; } |
|
20405 | 243 |
oop protection_domain() { return _pd_cache->protection_domain(); } |
1 | 244 |
}; |
245 |
||
246 |
// An entry in the system dictionary, this describes a class as |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
247 |
// { Klass*, loader, protection_domain }. |
1 | 248 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
249 |
class DictionaryEntry : public HashtableEntry<Klass*, mtClass> { |
1 | 250 |
friend class VMStructs; |
251 |
private: |
|
252 |
// Contains the set of approved protection domains that can access |
|
253 |
// this system dictionary entry. |
|
20405 | 254 |
// |
255 |
// This protection domain set is a set of tuples: |
|
256 |
// |
|
257 |
// (InstanceKlass C, initiating class loader ICL, Protection Domain PD) |
|
258 |
// |
|
259 |
// [Note that C.protection_domain(), which is stored in the java.lang.Class |
|
260 |
// mirror of C, is NOT the same as PD] |
|
261 |
// |
|
262 |
// If such an entry (C, ICL, PD) exists in the table, it means that |
|
263 |
// it is okay for a class Foo to reference C, where |
|
264 |
// |
|
265 |
// Foo.protection_domain() == PD, and |
|
266 |
// Foo's defining class loader == ICL |
|
267 |
// |
|
268 |
// The usage of the PD set can be seen in SystemDictionary::validate_protection_domain() |
|
269 |
// It is essentially a cache to avoid repeated Java up-calls to |
|
270 |
// ClassLoader.checkPackageAccess(). |
|
271 |
// |
|
1 | 272 |
ProtectionDomainEntry* _pd_set; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
273 |
ClassLoaderData* _loader_data; |
1 | 274 |
|
275 |
public: |
|
276 |
// Tells whether a protection is in the approved set. |
|
277 |
bool contains_protection_domain(oop protection_domain) const; |
|
278 |
// Adds a protection domain to the approved set. |
|
20405 | 279 |
void add_protection_domain(Dictionary* dict, oop protection_domain); |
1 | 280 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
281 |
Klass* klass() const { return (Klass*)literal(); } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
282 |
Klass** klass_addr() { return (Klass**)literal_addr(); } |
1 | 283 |
|
284 |
DictionaryEntry* next() const { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
285 |
return (DictionaryEntry*)HashtableEntry<Klass*, mtClass>::next(); |
1 | 286 |
} |
287 |
||
288 |
DictionaryEntry** next_addr() { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
289 |
return (DictionaryEntry**)HashtableEntry<Klass*, mtClass>::next_addr(); |
1 | 290 |
} |
291 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
292 |
ClassLoaderData* loader_data() const { return _loader_data; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
293 |
void set_loader_data(ClassLoaderData* loader_data) { _loader_data = loader_data; } |
1 | 294 |
|
295 |
ProtectionDomainEntry* pd_set() const { return _pd_set; } |
|
296 |
void set_pd_set(ProtectionDomainEntry* pd_set) { _pd_set = pd_set; } |
|
297 |
||
298 |
bool has_protection_domain() { return _pd_set != NULL; } |
|
299 |
||
300 |
// Tells whether the initiating class' protection can access the this _klass |
|
301 |
bool is_valid_protection_domain(Handle protection_domain) { |
|
302 |
if (!ProtectionDomainVerification) return true; |
|
303 |
if (!SystemDictionary::has_checkPackageAccess()) return true; |
|
304 |
||
305 |
return protection_domain() == NULL |
|
306 |
? true |
|
307 |
: contains_protection_domain(protection_domain()); |
|
308 |
} |
|
309 |
||
20405 | 310 |
void set_strongly_reachable() { |
1 | 311 |
for (ProtectionDomainEntry* current = _pd_set; |
312 |
current != NULL; |
|
313 |
current = current->_next) { |
|
20405 | 314 |
current->_pd_cache->set_strongly_reachable(); |
1 | 315 |
} |
316 |
} |
|
317 |
||
318 |
void verify_protection_domain_set() { |
|
319 |
for (ProtectionDomainEntry* current = _pd_set; |
|
320 |
current != NULL; |
|
321 |
current = current->_next) { |
|
20405 | 322 |
current->_pd_cache->protection_domain()->verify(); |
1 | 323 |
} |
324 |
} |
|
325 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
326 |
bool equals(Symbol* class_name, ClassLoaderData* loader_data) const { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
327 |
Klass* klass = (Klass*)literal(); |
33602 | 328 |
return (klass->name() == class_name && _loader_data == loader_data); |
1 | 329 |
} |
330 |
||
331 |
void print() { |
|
332 |
int count = 0; |
|
333 |
for (ProtectionDomainEntry* current = _pd_set; |
|
334 |
current != NULL; |
|
335 |
current = current->_next) { |
|
336 |
count++; |
|
337 |
} |
|
338 |
tty->print_cr("pd set = #%d", count); |
|
339 |
} |
|
340 |
}; |
|
2534 | 341 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
342 |
// Entry in a SymbolPropertyTable, mapping a single Symbol* |
2534 | 343 |
// to a managed and an unmanaged pointer. |
13195 | 344 |
class SymbolPropertyEntry : public HashtableEntry<Symbol*, mtSymbol> { |
2534 | 345 |
friend class VMStructs; |
346 |
private: |
|
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
347 |
intptr_t _symbol_mode; // secondary key |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
348 |
Method* _method; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
349 |
oop _method_type; |
2534 | 350 |
|
351 |
public: |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
352 |
Symbol* symbol() const { return literal(); } |
2534 | 353 |
|
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
354 |
intptr_t symbol_mode() const { return _symbol_mode; } |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
355 |
void set_symbol_mode(intptr_t m) { _symbol_mode = m; } |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
356 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
357 |
Method* method() const { return _method; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
358 |
void set_method(Method* p) { _method = p; } |
2534 | 359 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
360 |
oop method_type() const { return _method_type; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
361 |
oop* method_type_addr() { return &_method_type; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
362 |
void set_method_type(oop p) { _method_type = p; } |
2534 | 363 |
|
364 |
SymbolPropertyEntry* next() const { |
|
13195 | 365 |
return (SymbolPropertyEntry*)HashtableEntry<Symbol*, mtSymbol>::next(); |
2534 | 366 |
} |
367 |
||
368 |
SymbolPropertyEntry** next_addr() { |
|
13195 | 369 |
return (SymbolPropertyEntry**)HashtableEntry<Symbol*, mtSymbol>::next_addr(); |
2534 | 370 |
} |
371 |
||
372 |
void print_on(outputStream* st) const { |
|
373 |
symbol()->print_value_on(st); |
|
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
29081
diff
changeset
|
374 |
st->print("/mode=" INTX_FORMAT, symbol_mode()); |
2534 | 375 |
st->print(" -> "); |
376 |
bool printed = false; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
377 |
if (method() != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
378 |
method()->print_value_on(st); |
2534 | 379 |
printed = true; |
380 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
381 |
if (method_type() != NULL) { |
2534 | 382 |
if (printed) st->print(" and "); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
20408
diff
changeset
|
383 |
st->print(INTPTR_FORMAT, p2i((void *)method_type())); |
2534 | 384 |
printed = true; |
385 |
} |
|
386 |
st->print_cr(printed ? "" : "(empty)"); |
|
387 |
} |
|
388 |
}; |
|
389 |
||
390 |
// A system-internal mapping of symbols to pointers, both managed |
|
391 |
// and unmanaged. Used to record the auto-generation of each method |
|
392 |
// MethodHandle.invoke(S)T, for all signatures (S)T. |
|
13195 | 393 |
class SymbolPropertyTable : public Hashtable<Symbol*, mtSymbol> { |
2534 | 394 |
friend class VMStructs; |
395 |
private: |
|
396 |
SymbolPropertyEntry* bucket(int i) { |
|
13195 | 397 |
return (SymbolPropertyEntry*) Hashtable<Symbol*, mtSymbol>::bucket(i); |
2534 | 398 |
} |
399 |
||
400 |
// The following method is not MT-safe and must be done under lock. |
|
401 |
SymbolPropertyEntry** bucket_addr(int i) { |
|
13195 | 402 |
return (SymbolPropertyEntry**) Hashtable<Symbol*, mtSymbol>::bucket_addr(i); |
2534 | 403 |
} |
404 |
||
405 |
void add_entry(int index, SymbolPropertyEntry* new_entry) { |
|
406 |
ShouldNotReachHere(); |
|
407 |
} |
|
408 |
void set_entry(int index, SymbolPropertyEntry* new_entry) { |
|
409 |
ShouldNotReachHere(); |
|
410 |
} |
|
411 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
412 |
SymbolPropertyEntry* new_entry(unsigned int hash, Symbol* symbol, intptr_t symbol_mode) { |
13195 | 413 |
SymbolPropertyEntry* entry = (SymbolPropertyEntry*) Hashtable<Symbol*, mtSymbol>::new_entry(hash, symbol); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
414 |
// Hashtable with Symbol* literal must increment and decrement refcount. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
415 |
symbol->increment_refcount(); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
416 |
entry->set_symbol_mode(symbol_mode); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
417 |
entry->set_method(NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
418 |
entry->set_method_type(NULL); |
2534 | 419 |
return entry; |
420 |
} |
|
421 |
||
422 |
public: |
|
423 |
SymbolPropertyTable(int table_size); |
|
13195 | 424 |
SymbolPropertyTable(int table_size, HashtableBucket<mtSymbol>* t, int number_of_entries); |
2534 | 425 |
|
426 |
void free_entry(SymbolPropertyEntry* entry) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
427 |
// decrement Symbol refcount here because hashtable doesn't. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
428 |
entry->literal()->decrement_refcount(); |
13195 | 429 |
Hashtable<Symbol*, mtSymbol>::free_entry(entry); |
2534 | 430 |
} |
431 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
432 |
unsigned int compute_hash(Symbol* sym, intptr_t symbol_mode) { |
2534 | 433 |
// Use the regular identity_hash. |
13195 | 434 |
return Hashtable<Symbol*, mtSymbol>::compute_hash(sym) ^ symbol_mode; |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
435 |
} |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
436 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
437 |
int index_for(Symbol* name, intptr_t symbol_mode) { |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
2534
diff
changeset
|
438 |
return hash_to_index(compute_hash(name, symbol_mode)); |
2534 | 439 |
} |
440 |
||
441 |
// need not be locked; no state change |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
442 |
SymbolPropertyEntry* find_entry(int index, unsigned int hash, Symbol* name, intptr_t name_mode); |
2534 | 443 |
|
444 |
// must be done under SystemDictionary_lock |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
445 |
SymbolPropertyEntry* add_entry(int index, unsigned int hash, Symbol* name, intptr_t name_mode); |
2534 | 446 |
|
447 |
// GC support |
|
448 |
void oops_do(OopClosure* f); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
449 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
450 |
void methods_do(void f(Method*)); |
2534 | 451 |
|
452 |
// Sharing support |
|
453 |
void reorder_dictionary(); |
|
454 |
||
455 |
#ifndef PRODUCT |
|
456 |
void print(); |
|
457 |
#endif |
|
458 |
void verify(); |
|
459 |
}; |
|
7397 | 460 |
#endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP |