Mercurial > hg > graal-compiler
annotate src/share/vm/classfile/systemDictionary.cpp @ 8667:1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
Summary: SystemDictionary::find(...) should not create and register ClassLoaderData objects for class loaders.
Reviewed-by: coleenp, acorn
Contributed-by: Stefan Karlsson <stefan.karlsson@oracle.com>, Erik Helin <erik.helin@oracle.com>
author | stefank |
---|---|
date | Thu, 21 Feb 2013 17:22:15 +0100 |
parents | 8b46b0196eb0 |
children | 1fc4d4768b90 |
rev | line source |
---|---|
0 | 1 /* |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 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 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
26 #include "classfile/classLoaderData.inline.hpp" |
1972 | 27 #include "classfile/dictionary.hpp" |
28 #include "classfile/javaClasses.hpp" | |
29 #include "classfile/loaderConstraints.hpp" | |
30 #include "classfile/placeholders.hpp" | |
31 #include "classfile/resolutionErrors.hpp" | |
32 #include "classfile/systemDictionary.hpp" | |
33 #include "classfile/vmSymbols.hpp" | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
34 #include "compiler/compileBroker.hpp" |
1972 | 35 #include "interpreter/bytecodeStream.hpp" |
36 #include "interpreter/interpreter.hpp" | |
37 #include "memory/gcLocker.hpp" | |
38 #include "memory/oopFactory.hpp" | |
39 #include "oops/instanceKlass.hpp" | |
40 #include "oops/instanceRefKlass.hpp" | |
41 #include "oops/klass.inline.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
42 #include "oops/methodData.hpp" |
1972 | 43 #include "oops/objArrayKlass.hpp" |
44 #include "oops/oop.inline.hpp" | |
45 #include "oops/oop.inline2.hpp" | |
46 #include "oops/typeArrayKlass.hpp" | |
47 #include "prims/jvmtiEnvBase.hpp" | |
48 #include "prims/methodHandles.hpp" | |
49 #include "runtime/biasedLocking.hpp" | |
50 #include "runtime/fieldType.hpp" | |
51 #include "runtime/handles.inline.hpp" | |
52 #include "runtime/java.hpp" | |
53 #include "runtime/javaCalls.hpp" | |
54 #include "runtime/mutexLocker.hpp" | |
55 #include "runtime/signature.hpp" | |
56 #include "services/classLoadingService.hpp" | |
57 #include "services/threadService.hpp" | |
0 | 58 |
59 | |
1903 | 60 Dictionary* SystemDictionary::_dictionary = NULL; |
61 PlaceholderTable* SystemDictionary::_placeholders = NULL; | |
62 Dictionary* SystemDictionary::_shared_dictionary = NULL; | |
63 LoaderConstraintTable* SystemDictionary::_loader_constraints = NULL; | |
64 ResolutionErrorTable* SystemDictionary::_resolution_errors = NULL; | |
65 SymbolPropertyTable* SystemDictionary::_invoke_method_table = NULL; | |
0 | 66 |
67 | |
68 int SystemDictionary::_number_of_modifications = 0; | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
69 int SystemDictionary::_sdgeneration = 0; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
70 const int SystemDictionary::_primelist[_prime_array_size] = {1009,2017,4049,5051,10103, |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
71 20201,40423,99991}; |
0 | 72 |
73 oop SystemDictionary::_system_loader_lock_obj = NULL; | |
74 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
75 Klass* SystemDictionary::_well_known_klasses[SystemDictionary::WKID_LIMIT] |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
76 = { NULL /*, NULL...*/ }; |
0 | 77 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
78 Klass* SystemDictionary::_box_klasses[T_VOID+1] = { NULL /*, NULL...*/ }; |
0 | 79 |
80 oop SystemDictionary::_java_system_loader = NULL; | |
81 | |
82 bool SystemDictionary::_has_loadClassInternal = false; | |
83 bool SystemDictionary::_has_checkPackageAccess = false; | |
84 | |
85 // lazily initialized klass variables | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
86 Klass* volatile SystemDictionary::_abstract_ownable_synchronizer_klass = NULL; |
0 | 87 |
88 | |
89 // ---------------------------------------------------------------------------- | |
90 // Java-level SystemLoader | |
91 | |
92 oop SystemDictionary::java_system_loader() { | |
93 return _java_system_loader; | |
94 } | |
95 | |
96 void SystemDictionary::compute_java_system_loader(TRAPS) { | |
1142 | 97 KlassHandle system_klass(THREAD, WK_KLASS(ClassLoader_klass)); |
0 | 98 JavaValue result(T_OBJECT); |
99 JavaCalls::call_static(&result, | |
1142 | 100 KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)), |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
101 vmSymbols::getSystemClassLoader_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
102 vmSymbols::void_classloader_signature(), |
0 | 103 CHECK); |
104 | |
105 _java_system_loader = (oop)result.get_jobject(); | |
106 } | |
107 | |
108 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
109 ClassLoaderData* SystemDictionary::register_loader(Handle class_loader, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
110 if (class_loader() == NULL) return ClassLoaderData::the_null_class_loader_data(); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
111 return ClassLoaderDataGraph::find_or_create(class_loader, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
112 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
113 |
0 | 114 // ---------------------------------------------------------------------------- |
115 // debugging | |
116 | |
117 #ifdef ASSERT | |
118 | |
119 // return true if class_name contains no '.' (internal format is '/') | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
120 bool SystemDictionary::is_internal_format(Symbol* class_name) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
121 if (class_name != NULL) { |
0 | 122 ResourceMark rm; |
123 char* name = class_name->as_C_string(); | |
124 return strchr(name, '.') == NULL; | |
125 } else { | |
126 return true; | |
127 } | |
128 } | |
129 | |
130 #endif | |
131 | |
132 // ---------------------------------------------------------------------------- | |
514 | 133 // Parallel class loading check |
134 | |
135 bool SystemDictionary::is_parallelCapable(Handle class_loader) { | |
136 if (UnsyncloadClass || class_loader.is_null()) return true; | |
137 if (AlwaysLockClassLoader) return false; | |
3938 | 138 return java_lang_ClassLoader::parallelCapable(class_loader()); |
514 | 139 } |
140 // ---------------------------------------------------------------------------- | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
141 // ParallelDefineClass flag does not apply to bootclass loader |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
142 bool SystemDictionary::is_parallelDefine(Handle class_loader) { |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
143 if (class_loader.is_null()) return false; |
3938 | 144 if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) { |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
145 return true; |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
146 } |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
147 return false; |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
148 } |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
149 // ---------------------------------------------------------------------------- |
0 | 150 // Resolving of classes |
151 | |
152 // Forwards to resolve_or_null | |
153 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
154 Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
155 Klass* klass = resolve_or_null(class_name, class_loader, protection_domain, THREAD); |
0 | 156 if (HAS_PENDING_EXCEPTION || klass == NULL) { |
157 KlassHandle k_h(THREAD, klass); | |
158 // can return a null klass | |
159 klass = handle_resolution_exception(class_name, class_loader, protection_domain, throw_error, k_h, THREAD); | |
160 } | |
161 return klass; | |
162 } | |
163 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
164 Klass* SystemDictionary::handle_resolution_exception(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS) { |
0 | 165 if (HAS_PENDING_EXCEPTION) { |
166 // If we have a pending exception we forward it to the caller, unless throw_error is true, | |
167 // in which case we have to check whether the pending exception is a ClassNotFoundException, | |
168 // and if so convert it to a NoClassDefFoundError | |
169 // And chain the original ClassNotFoundException | |
1142 | 170 if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass())) { |
0 | 171 ResourceMark rm(THREAD); |
172 assert(klass_h() == NULL, "Should not have result with exception pending"); | |
173 Handle e(THREAD, PENDING_EXCEPTION); | |
174 CLEAR_PENDING_EXCEPTION; | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
175 THROW_MSG_CAUSE_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string(), e); |
0 | 176 } else { |
177 return NULL; | |
178 } | |
179 } | |
180 // Class not found, throw appropriate error or exception depending on value of throw_error | |
181 if (klass_h() == NULL) { | |
182 ResourceMark rm(THREAD); | |
183 if (throw_error) { | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
184 THROW_MSG_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string()); |
0 | 185 } else { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
186 THROW_MSG_NULL(vmSymbols::java_lang_ClassNotFoundException(), class_name->as_C_string()); |
0 | 187 } |
188 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
189 return (Klass*)klass_h(); |
0 | 190 } |
191 | |
192 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
193 Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, |
0 | 194 bool throw_error, TRAPS) |
195 { | |
196 return resolve_or_fail(class_name, Handle(), Handle(), throw_error, THREAD); | |
197 } | |
198 | |
199 | |
200 // Forwards to resolve_instance_class_or_null | |
201 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
202 Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
203 assert(!THREAD->is_Compiler_thread(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
204 err_msg("can not load classes with compiler thread: class=%s, classloader=%s", |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
205 class_name->as_C_string(), |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
206 class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
207 if (FieldType::is_array(class_name)) { |
0 | 208 return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
209 } else if (FieldType::is_obj(class_name)) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
210 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
211 // Ignore wrapping L and ;. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
212 TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
213 class_name->utf8_length() - 2, CHECK_NULL); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
214 return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL); |
0 | 215 } else { |
216 return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); | |
217 } | |
218 } | |
219 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
220 Klass* SystemDictionary::resolve_or_null(Symbol* class_name, TRAPS) { |
0 | 221 return resolve_or_null(class_name, Handle(), Handle(), THREAD); |
222 } | |
223 | |
224 // Forwards to resolve_instance_class_or_null | |
225 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
226 Klass* SystemDictionary::resolve_array_class_or_null(Symbol* class_name, |
0 | 227 Handle class_loader, |
228 Handle protection_domain, | |
229 TRAPS) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
230 assert(FieldType::is_array(class_name), "must be array"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
231 Klass* k = NULL; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
232 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
233 // dimension and object_key in FieldArrayInfo are assigned as a side-effect |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
234 // of this call |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
235 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_NULL); |
0 | 236 if (t == T_OBJECT) { |
237 // naked oop "k" is OK here -- we assign back into it | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
238 k = SystemDictionary::resolve_instance_class_or_null(fd.object_key(), |
0 | 239 class_loader, |
240 protection_domain, | |
241 CHECK_NULL); | |
242 if (k != NULL) { | |
6983 | 243 k = k->array_klass(fd.dimension(), CHECK_NULL); |
0 | 244 } |
245 } else { | |
246 k = Universe::typeArrayKlassObj(t); | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
247 k = TypeArrayKlass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); |
0 | 248 } |
249 return k; | |
250 } | |
251 | |
252 | |
253 // Must be called for any super-class or super-interface resolution | |
254 // during class definition to allow class circularity checking | |
255 // super-interface callers: | |
256 // parse_interfaces - for defineClass & jvmtiRedefineClasses | |
257 // super-class callers: | |
258 // ClassFileParser - for defineClass & jvmtiRedefineClasses | |
259 // load_shared_class - while loading a class from shared archive | |
514 | 260 // resolve_instance_class_or_null: |
261 // via: handle_parallel_super_load | |
0 | 262 // when resolving a class that has an existing placeholder with |
263 // a saved superclass [i.e. a defineClass is currently in progress] | |
264 // if another thread is trying to resolve the class, it must do | |
265 // super-class checks on its own thread to catch class circularity | |
266 // This last call is critical in class circularity checking for cases | |
267 // where classloading is delegated to different threads and the | |
268 // classloader lock is released. | |
269 // Take the case: Base->Super->Base | |
270 // 1. If thread T1 tries to do a defineClass of class Base | |
271 // resolve_super_or_fail creates placeholder: T1, Base (super Super) | |
272 // 2. resolve_instance_class_or_null does not find SD or placeholder for Super | |
273 // so it tries to load Super | |
274 // 3. If we load the class internally, or user classloader uses same thread | |
275 // loadClassFromxxx or defineClass via parseClassFile Super ... | |
276 // 3.1 resolve_super_or_fail creates placeholder: T1, Super (super Base) | |
277 // 3.3 resolve_instance_class_or_null Base, finds placeholder for Base | |
278 // 3.4 calls resolve_super_or_fail Base | |
279 // 3.5 finds T1,Base -> throws class circularity | |
280 //OR 4. If T2 tries to resolve Super via defineClass Super ... | |
281 // 4.1 resolve_super_or_fail creates placeholder: T2, Super (super Base) | |
282 // 4.2 resolve_instance_class_or_null Base, finds placeholder for Base (super Super) | |
283 // 4.3 calls resolve_super_or_fail Super in parallel on own thread T2 | |
284 // 4.4 finds T2, Super -> throws class circularity | |
285 // Must be called, even if superclass is null, since this is | |
286 // where the placeholder entry is created which claims this | |
287 // thread is loading this class/classloader. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
288 Klass* SystemDictionary::resolve_super_or_fail(Symbol* child_name, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
289 Symbol* class_name, |
0 | 290 Handle class_loader, |
291 Handle protection_domain, | |
292 bool is_superclass, | |
293 TRAPS) { | |
294 // Double-check, if child class is already loaded, just return super-class,interface | |
295 // Don't add a placedholder if already loaded, i.e. already in system dictionary | |
296 // Make sure there's a placeholder for the *child* before resolving. | |
297 // Used as a claim that this thread is currently loading superclass/classloader | |
298 // Used here for ClassCircularity checks and also for heap verification | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
299 // (every InstanceKlass in the heap needs to be in the system dictionary |
0 | 300 // or have a placeholder). |
301 // Must check ClassCircularity before checking if super class is already loaded | |
302 // | |
303 // We might not already have a placeholder if this child_name was | |
304 // first seen via resolve_from_stream (jni_DefineClass or JVM_DefineClass); | |
305 // the name of the class might not be known until the stream is actually | |
306 // parsed. | |
307 // Bugs 4643874, 4715493 | |
308 // compute_hash can have a safepoint | |
309 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
310 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
311 unsigned int d_hash = dictionary()->compute_hash(child_name, loader_data); |
0 | 312 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
313 unsigned int p_hash = placeholders()->compute_hash(child_name, loader_data); |
0 | 314 int p_index = placeholders()->hash_to_index(p_hash); |
315 // can't throw error holding a lock | |
316 bool child_already_loaded = false; | |
317 bool throw_circularity_error = false; | |
318 { | |
319 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
320 Klass* childk = find_class(d_index, d_hash, child_name, loader_data); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
321 Klass* quicksuperk; |
0 | 322 // to support // loading: if child done loading, just return superclass |
323 // if class_name, & class_loader don't match: | |
324 // if initial define, SD update will give LinkageError | |
325 // if redefine: compare_class_versions will give HIERARCHY_CHANGED | |
326 // so we don't throw an exception here. | |
327 // see: nsk redefclass014 & java.lang.instrument Instrument032 | |
328 if ((childk != NULL ) && (is_superclass) && | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
329 ((quicksuperk = InstanceKlass::cast(childk)->super()) != NULL) && |
0 | 330 |
6983 | 331 ((quicksuperk->name() == class_name) && |
332 (quicksuperk->class_loader() == class_loader()))) { | |
0 | 333 return quicksuperk; |
334 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
335 PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, child_name, loader_data); |
0 | 336 if (probe && probe->check_seen_thread(THREAD, PlaceholderTable::LOAD_SUPER)) { |
337 throw_circularity_error = true; | |
338 } | |
514 | 339 } |
340 if (!throw_circularity_error) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
341 PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, child_name, loader_data, PlaceholderTable::LOAD_SUPER, class_name, THREAD); |
0 | 342 } |
343 } | |
344 if (throw_circularity_error) { | |
345 ResourceMark rm(THREAD); | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
346 THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), child_name->as_C_string()); |
0 | 347 } |
348 | |
349 // java.lang.Object should have been found above | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
350 assert(class_name != NULL, "null super class for resolving"); |
0 | 351 // Resolve the super class or interface, check results on return |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
352 Klass* superk = SystemDictionary::resolve_or_null(class_name, |
0 | 353 class_loader, |
354 protection_domain, | |
355 THREAD); | |
356 | |
357 KlassHandle superk_h(THREAD, superk); | |
358 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
359 // Clean up of placeholders moved so that each classloadAction registrar self-cleans up |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
360 // It is no longer necessary to keep the placeholder table alive until update_dictionary |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
361 // or error. GC used to walk the placeholder table as strong roots. |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
362 // The instanceKlass is kept alive because the class loader is on the stack, |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
363 // which keeps the loader_data alive, as well as all instanceKlasses in |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
364 // the loader_data. parseClassFile adds the instanceKlass to loader_data. |
0 | 365 { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
366 MutexLocker mu(SystemDictionary_lock, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
367 placeholders()->find_and_remove(p_index, p_hash, child_name, loader_data, PlaceholderTable::LOAD_SUPER, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
368 SystemDictionary_lock->notify_all(); |
0 | 369 } |
370 if (HAS_PENDING_EXCEPTION || superk_h() == NULL) { | |
371 // can null superk | |
372 superk_h = KlassHandle(THREAD, handle_resolution_exception(class_name, class_loader, protection_domain, true, superk_h, THREAD)); | |
373 } | |
374 | |
375 return superk_h(); | |
376 } | |
377 | |
378 void SystemDictionary::validate_protection_domain(instanceKlassHandle klass, | |
379 Handle class_loader, | |
380 Handle protection_domain, | |
381 TRAPS) { | |
382 if(!has_checkPackageAccess()) return; | |
383 | |
384 // Now we have to call back to java to check if the initating class has access | |
385 JavaValue result(T_VOID); | |
386 if (TraceProtectionDomainVerification) { | |
387 // Print out trace information | |
388 tty->print_cr("Checking package access"); | |
389 tty->print(" - class loader: "); class_loader()->print_value_on(tty); tty->cr(); | |
390 tty->print(" - protection domain: "); protection_domain()->print_value_on(tty); tty->cr(); | |
391 tty->print(" - loading: "); klass()->print_value_on(tty); tty->cr(); | |
392 } | |
393 | |
1142 | 394 KlassHandle system_loader(THREAD, SystemDictionary::ClassLoader_klass()); |
0 | 395 JavaCalls::call_special(&result, |
396 class_loader, | |
397 system_loader, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
398 vmSymbols::checkPackageAccess_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
399 vmSymbols::class_protectiondomain_signature(), |
0 | 400 Handle(THREAD, klass->java_mirror()), |
401 protection_domain, | |
402 THREAD); | |
403 | |
404 if (TraceProtectionDomainVerification) { | |
405 if (HAS_PENDING_EXCEPTION) { | |
406 tty->print_cr(" -> DENIED !!!!!!!!!!!!!!!!!!!!!"); | |
407 } else { | |
408 tty->print_cr(" -> granted"); | |
409 } | |
410 tty->cr(); | |
411 } | |
412 | |
413 if (HAS_PENDING_EXCEPTION) return; | |
414 | |
415 // If no exception has been thrown, we have validated the protection domain | |
416 // Insert the protection domain of the initiating class into the set. | |
417 { | |
418 // We recalculate the entry here -- we've called out to java since | |
419 // the last time it was calculated. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
420 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
421 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
422 Symbol* kn = klass->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
423 unsigned int d_hash = dictionary()->compute_hash(kn, loader_data); |
0 | 424 int d_index = dictionary()->hash_to_index(d_hash); |
425 | |
426 MutexLocker mu(SystemDictionary_lock, THREAD); | |
427 { | |
428 // Note that we have an entry, and entries can be deleted only during GC, | |
429 // so we cannot allow GC to occur while we're holding this entry. | |
430 | |
431 // We're using a No_Safepoint_Verifier to catch any place where we | |
432 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
433 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
434 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 435 No_Safepoint_Verifier nosafepoint; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
436 dictionary()->add_protection_domain(d_index, d_hash, klass, loader_data, |
0 | 437 protection_domain, THREAD); |
438 } | |
439 } | |
440 } | |
441 | |
442 // We only get here if this thread finds that another thread | |
443 // has already claimed the placeholder token for the current operation, | |
444 // but that other thread either never owned or gave up the | |
445 // object lock | |
446 // Waits on SystemDictionary_lock to indicate placeholder table updated | |
447 // On return, caller must recheck placeholder table state | |
448 // | |
449 // We only get here if | |
450 // 1) custom classLoader, i.e. not bootstrap classloader | |
451 // 2) UnsyncloadClass not set | |
452 // 3) custom classLoader has broken the class loader objectLock | |
453 // so another thread got here in parallel | |
454 // | |
455 // lockObject must be held. | |
456 // Complicated dance due to lock ordering: | |
457 // Must first release the classloader object lock to | |
458 // allow initial definer to complete the class definition | |
459 // and to avoid deadlock | |
460 // Reclaim classloader lock object with same original recursion count | |
461 // Must release SystemDictionary_lock after notify, since | |
462 // class loader lock must be claimed before SystemDictionary_lock | |
463 // to prevent deadlocks | |
464 // | |
465 // The notify allows applications that did an untimed wait() on | |
466 // the classloader object lock to not hang. | |
467 void SystemDictionary::double_lock_wait(Handle lockObject, TRAPS) { | |
468 assert_lock_strong(SystemDictionary_lock); | |
469 | |
470 bool calledholdinglock | |
471 = ObjectSynchronizer::current_thread_holds_lock((JavaThread*)THREAD, lockObject); | |
472 assert(calledholdinglock,"must hold lock for notify"); | |
514 | 473 assert((!(lockObject() == _system_loader_lock_obj) && !is_parallelCapable(lockObject)), "unexpected double_lock_wait"); |
0 | 474 ObjectSynchronizer::notifyall(lockObject, THREAD); |
475 intptr_t recursions = ObjectSynchronizer::complete_exit(lockObject, THREAD); | |
476 SystemDictionary_lock->wait(); | |
477 SystemDictionary_lock->unlock(); | |
478 ObjectSynchronizer::reenter(lockObject, recursions, THREAD); | |
479 SystemDictionary_lock->lock(); | |
480 } | |
481 | |
482 // If the class in is in the placeholder table, class loading is in progress | |
483 // For cases where the application changes threads to load classes, it | |
484 // is critical to ClassCircularity detection that we try loading | |
485 // the superclass on the same thread internally, so we do parallel | |
486 // super class loading here. | |
487 // This also is critical in cases where the original thread gets stalled | |
488 // even in non-circularity situations. | |
489 // Note: must call resolve_super_or_fail even if null super - | |
514 | 490 // to force placeholder entry creation for this class for circularity detection |
0 | 491 // Caller must check for pending exception |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
492 // Returns non-null Klass* if other thread has completed load |
0 | 493 // and we are done, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
494 // If return null Klass* and no pending exception, the caller must load the class |
0 | 495 instanceKlassHandle SystemDictionary::handle_parallel_super_load( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
496 Symbol* name, Symbol* superclassname, Handle class_loader, |
0 | 497 Handle protection_domain, Handle lockObject, TRAPS) { |
498 | |
499 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
500 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
501 unsigned int d_hash = dictionary()->compute_hash(name, loader_data); |
0 | 502 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
503 unsigned int p_hash = placeholders()->compute_hash(name, loader_data); |
0 | 504 int p_index = placeholders()->hash_to_index(p_hash); |
505 | |
506 // superk is not used, resolve_super called for circularity check only | |
507 // This code is reached in two situations. One if this thread | |
508 // is loading the same class twice (e.g. ClassCircularity, or | |
509 // java.lang.instrument). | |
510 // The second is if another thread started the resolve_super first | |
511 // and has not yet finished. | |
512 // In both cases the original caller will clean up the placeholder | |
513 // entry on error. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
514 Klass* superk = SystemDictionary::resolve_super_or_fail(name, |
0 | 515 superclassname, |
516 class_loader, | |
517 protection_domain, | |
518 true, | |
519 CHECK_(nh)); | |
520 | |
514 | 521 // parallelCapable class loaders do NOT wait for parallel superclass loads to complete |
522 // Serial class loaders and bootstrap classloader do wait for superclass loads | |
523 if (!class_loader.is_null() && is_parallelCapable(class_loader)) { | |
0 | 524 MutexLocker mu(SystemDictionary_lock, THREAD); |
525 // Check if classloading completed while we were loading superclass or waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
526 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 527 if (check != NULL) { |
528 // Klass is already loaded, so just return it | |
529 return(instanceKlassHandle(THREAD, check)); | |
530 } else { | |
531 return nh; | |
532 } | |
533 } | |
534 | |
535 // must loop to both handle other placeholder updates | |
536 // and spurious notifications | |
537 bool super_load_in_progress = true; | |
538 PlaceholderEntry* placeholder; | |
539 while (super_load_in_progress) { | |
540 MutexLocker mu(SystemDictionary_lock, THREAD); | |
541 // Check if classloading completed while we were loading superclass or waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
542 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 543 if (check != NULL) { |
544 // Klass is already loaded, so just return it | |
545 return(instanceKlassHandle(THREAD, check)); | |
546 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
547 placeholder = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 548 if (placeholder && placeholder->super_load_in_progress() ){ |
549 // Before UnsyncloadClass: | |
550 // We only get here if the application has released the | |
551 // classloader lock when another thread was in the middle of loading a | |
552 // superclass/superinterface for this class, and now | |
553 // this thread is also trying to load this class. | |
554 // To minimize surprises, the first thread that started to | |
555 // load a class should be the one to complete the loading | |
556 // with the classfile it initially expected. | |
557 // This logic has the current thread wait once it has done | |
558 // all the superclass/superinterface loading it can, until | |
559 // the original thread completes the class loading or fails | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
560 // If it completes we will use the resulting InstanceKlass |
0 | 561 // which we will find below in the systemDictionary. |
562 // We also get here for parallel bootstrap classloader | |
563 if (class_loader.is_null()) { | |
564 SystemDictionary_lock->wait(); | |
565 } else { | |
566 double_lock_wait(lockObject, THREAD); | |
567 } | |
568 } else { | |
569 // If not in SD and not in PH, other thread's load must have failed | |
570 super_load_in_progress = false; | |
571 } | |
572 } | |
573 } | |
574 return (nh); | |
575 } | |
576 | |
577 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
578 Klass* SystemDictionary::resolve_instance_class_or_null(Symbol* name, Handle class_loader, Handle protection_domain, TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
579 assert(name != NULL && !FieldType::is_array(name) && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
580 !FieldType::is_obj(name), "invalid class name"); |
0 | 581 |
582 // UseNewReflection | |
583 // Fix for 4474172; see evaluation for more details | |
584 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
585 ClassLoaderData *loader_data = register_loader(class_loader, CHECK_NULL); |
0 | 586 |
587 // Do lookup to see if class already exist and the protection domain | |
588 // has the right access | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
589 // This call uses find which checks protection domain already matches |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
590 // All subsequent calls use find_class, and set has_loaded_class so that |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
591 // before we return a result we call out to java to check for valid protection domain |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
592 // to allow returning the Klass* and add it to the pd_set if it is valid |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
593 unsigned int d_hash = dictionary()->compute_hash(name, loader_data); |
0 | 594 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
595 Klass* probe = dictionary()->find(d_index, d_hash, name, loader_data, |
0 | 596 protection_domain, THREAD); |
597 if (probe != NULL) return probe; | |
598 | |
599 | |
600 // Non-bootstrap class loaders will call out to class loader and | |
601 // define via jvm/jni_DefineClass which will acquire the | |
602 // class loader object lock to protect against multiple threads | |
603 // defining the class in parallel by accident. | |
604 // This lock must be acquired here so the waiter will find | |
605 // any successful result in the SystemDictionary and not attempt | |
606 // the define | |
514 | 607 // ParallelCapable Classloaders and the bootstrap classloader, |
0 | 608 // or all classloaders with UnsyncloadClass do not acquire lock here |
609 bool DoObjectLock = true; | |
514 | 610 if (is_parallelCapable(class_loader)) { |
0 | 611 DoObjectLock = false; |
612 } | |
613 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
614 unsigned int p_hash = placeholders()->compute_hash(name, loader_data); |
0 | 615 int p_index = placeholders()->hash_to_index(p_hash); |
616 | |
617 // Class is not in SystemDictionary so we have to do loading. | |
618 // Make sure we are synchronized on the class loader before we proceed | |
619 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); | |
620 check_loader_lock_contention(lockObject, THREAD); | |
621 ObjectLocker ol(lockObject, THREAD, DoObjectLock); | |
622 | |
623 // Check again (after locking) if class already exist in SystemDictionary | |
624 bool class_has_been_loaded = false; | |
625 bool super_load_in_progress = false; | |
626 bool havesupername = false; | |
627 instanceKlassHandle k; | |
628 PlaceholderEntry* placeholder; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
629 Symbol* superclassname = NULL; |
0 | 630 |
631 { | |
632 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
633 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 634 if (check != NULL) { |
635 // Klass is already loaded, so just return it | |
636 class_has_been_loaded = true; | |
637 k = instanceKlassHandle(THREAD, check); | |
638 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
639 placeholder = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 640 if (placeholder && placeholder->super_load_in_progress()) { |
641 super_load_in_progress = true; | |
642 if (placeholder->havesupername() == true) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
643 superclassname = placeholder->supername(); |
0 | 644 havesupername = true; |
645 } | |
646 } | |
647 } | |
648 } | |
649 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
650 // If the class is in the placeholder table, class loading is in progress |
0 | 651 if (super_load_in_progress && havesupername==true) { |
652 k = SystemDictionary::handle_parallel_super_load(name, superclassname, | |
653 class_loader, protection_domain, lockObject, THREAD); | |
654 if (HAS_PENDING_EXCEPTION) { | |
655 return NULL; | |
656 } | |
657 if (!k.is_null()) { | |
658 class_has_been_loaded = true; | |
659 } | |
660 } | |
661 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
662 bool throw_circularity_error = false; |
0 | 663 if (!class_has_been_loaded) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
664 bool load_instance_added = false; |
0 | 665 |
666 // add placeholder entry to record loading instance class | |
667 // Five cases: | |
668 // All cases need to prevent modifying bootclasssearchpath | |
669 // in parallel with a classload of same classname | |
514 | 670 // Redefineclasses uses existence of the placeholder for the duration |
671 // of the class load to prevent concurrent redefinition of not completely | |
672 // defined classes. | |
0 | 673 // case 1. traditional classloaders that rely on the classloader object lock |
674 // - no other need for LOAD_INSTANCE | |
675 // case 2. traditional classloaders that break the classloader object lock | |
676 // as a deadlock workaround. Detection of this case requires that | |
677 // this check is done while holding the classloader object lock, | |
678 // and that lock is still held when calling classloader's loadClass. | |
679 // For these classloaders, we ensure that the first requestor | |
680 // completes the load and other requestors wait for completion. | |
681 // case 3. UnsyncloadClass - don't use objectLocker | |
682 // With this flag, we allow parallel classloading of a | |
683 // class/classloader pair | |
684 // case4. Bootstrap classloader - don't own objectLocker | |
685 // This classloader supports parallelism at the classloader level, | |
686 // but only allows a single load of a class/classloader pair. | |
687 // No performance benefit and no deadlock issues. | |
514 | 688 // case 5. parallelCapable user level classloaders - without objectLocker |
689 // Allow parallel classloading of a class/classloader pair | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
690 |
0 | 691 { |
692 MutexLocker mu(SystemDictionary_lock, THREAD); | |
514 | 693 if (class_loader.is_null() || !is_parallelCapable(class_loader)) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
694 PlaceholderEntry* oldprobe = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 695 if (oldprobe) { |
696 // only need check_seen_thread once, not on each loop | |
697 // 6341374 java/lang/Instrument with -Xcomp | |
698 if (oldprobe->check_seen_thread(THREAD, PlaceholderTable::LOAD_INSTANCE)) { | |
699 throw_circularity_error = true; | |
700 } else { | |
701 // case 1: traditional: should never see load_in_progress. | |
702 while (!class_has_been_loaded && oldprobe && oldprobe->instance_load_in_progress()) { | |
703 | |
704 // case 4: bootstrap classloader: prevent futile classloading, | |
705 // wait on first requestor | |
706 if (class_loader.is_null()) { | |
707 SystemDictionary_lock->wait(); | |
708 } else { | |
709 // case 2: traditional with broken classloader lock. wait on first | |
710 // requestor. | |
711 double_lock_wait(lockObject, THREAD); | |
712 } | |
713 // Check if classloading completed while we were waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
714 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 715 if (check != NULL) { |
716 // Klass is already loaded, so just return it | |
717 k = instanceKlassHandle(THREAD, check); | |
718 class_has_been_loaded = true; | |
719 } | |
720 // check if other thread failed to load and cleaned up | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
721 oldprobe = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 722 } |
723 } | |
724 } | |
725 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
726 // All cases: add LOAD_INSTANCE holding SystemDictionary_lock |
514 | 727 // case 3: UnsyncloadClass || case 5: parallelCapable: allow competing threads to try |
0 | 728 // LOAD_INSTANCE in parallel |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
729 |
514 | 730 if (!throw_circularity_error && !class_has_been_loaded) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
731 PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, NULL, THREAD); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
732 load_instance_added = true; |
0 | 733 // For class loaders that do not acquire the classloader object lock, |
734 // if they did not catch another thread holding LOAD_INSTANCE, | |
735 // need a check analogous to the acquire ObjectLocker/find_class | |
736 // i.e. now that we hold the LOAD_INSTANCE token on loading this class/CL | |
737 // one final check if the load has already completed | |
514 | 738 // class loaders holding the ObjectLock shouldn't find the class here |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
739 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 740 if (check != NULL) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
741 // Klass is already loaded, so return it after checking/adding protection domain |
0 | 742 k = instanceKlassHandle(THREAD, check); |
743 class_has_been_loaded = true; | |
744 } | |
745 } | |
746 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
747 |
0 | 748 // must throw error outside of owning lock |
749 if (throw_circularity_error) { | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
750 assert(!HAS_PENDING_EXCEPTION && load_instance_added == false,"circularity error cleanup"); |
0 | 751 ResourceMark rm(THREAD); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
752 THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), name->as_C_string()); |
0 | 753 } |
754 | |
755 if (!class_has_been_loaded) { | |
756 | |
757 // Do actual loading | |
758 k = load_instance_class(name, class_loader, THREAD); | |
759 | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
760 // For UnsyncloadClass only |
0 | 761 // If they got a linkageError, check if a parallel class load succeeded. |
762 // If it did, then for bytecode resolution the specification requires | |
763 // that we return the same result we did for the other thread, i.e. the | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
764 // successfully loaded InstanceKlass |
0 | 765 // Should not get here for classloaders that support parallelism |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
766 // with the new cleaner mechanism, even with AllowParallelDefineClass |
514 | 767 // Bootstrap goes through here to allow for an extra guarantee check |
0 | 768 if (UnsyncloadClass || (class_loader.is_null())) { |
769 if (k.is_null() && HAS_PENDING_EXCEPTION | |
1142 | 770 && PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) { |
0 | 771 MutexLocker mu(SystemDictionary_lock, THREAD); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
772 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 773 if (check != NULL) { |
774 // Klass is already loaded, so just use it | |
775 k = instanceKlassHandle(THREAD, check); | |
776 CLEAR_PENDING_EXCEPTION; | |
777 guarantee((!class_loader.is_null()), "dup definition for bootstrap loader?"); | |
778 } | |
779 } | |
780 } | |
781 | |
782 // If everything was OK (no exceptions, no null return value), and | |
783 // class_loader is NOT the defining loader, do a little more bookkeeping. | |
784 if (!HAS_PENDING_EXCEPTION && !k.is_null() && | |
785 k->class_loader() != class_loader()) { | |
786 | |
787 check_constraints(d_index, d_hash, k, class_loader, false, THREAD); | |
788 | |
789 // Need to check for a PENDING_EXCEPTION again; check_constraints | |
790 // can throw and doesn't use the CHECK macro. | |
791 if (!HAS_PENDING_EXCEPTION) { | |
792 { // Grabbing the Compile_lock prevents systemDictionary updates | |
793 // during compilations. | |
794 MutexLocker mu(Compile_lock, THREAD); | |
795 update_dictionary(d_index, d_hash, p_index, p_hash, | |
796 k, class_loader, THREAD); | |
797 } | |
798 if (JvmtiExport::should_post_class_load()) { | |
799 Thread *thread = THREAD; | |
800 assert(thread->is_Java_thread(), "thread->is_Java_thread()"); | |
801 JvmtiExport::post_class_load((JavaThread *) thread, k()); | |
802 } | |
803 } | |
804 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
805 } // load_instance_class loop |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
806 |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
807 if (load_instance_added == true) { |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
808 // clean up placeholder entries for LOAD_INSTANCE success or error |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
809 // This brackets the SystemDictionary updates for both defining |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
810 // and initiating loaders |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
811 MutexLocker mu(SystemDictionary_lock, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
812 placeholders()->find_and_remove(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
813 SystemDictionary_lock->notify_all(); |
0 | 814 } |
815 } | |
816 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
817 if (HAS_PENDING_EXCEPTION || k.is_null()) { |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
818 return NULL; |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
819 } |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
820 |
0 | 821 #ifdef ASSERT |
822 { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
823 ClassLoaderData* loader_data = k->class_loader_data(); |
0 | 824 MutexLocker mu(SystemDictionary_lock, THREAD); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
825 Klass* kk = find_class(name, loader_data); |
0 | 826 assert(kk == k(), "should be present in dictionary"); |
827 } | |
828 #endif | |
829 | |
830 // return if the protection domain in NULL | |
831 if (protection_domain() == NULL) return k(); | |
832 | |
833 // Check the protection domain has the right access | |
834 { | |
835 MutexLocker mu(SystemDictionary_lock, THREAD); | |
836 // Note that we have an entry, and entries can be deleted only during GC, | |
837 // so we cannot allow GC to occur while we're holding this entry. | |
838 // We're using a No_Safepoint_Verifier to catch any place where we | |
839 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
840 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
841 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 842 No_Safepoint_Verifier nosafepoint; |
843 if (dictionary()->is_valid_protection_domain(d_index, d_hash, name, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
844 loader_data, |
0 | 845 protection_domain)) { |
846 return k(); | |
847 } | |
848 } | |
849 | |
850 // Verify protection domain. If it fails an exception is thrown | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
851 validate_protection_domain(k, class_loader, protection_domain, CHECK_NULL); |
0 | 852 |
853 return k(); | |
854 } | |
855 | |
856 | |
857 // This routine does not lock the system dictionary. | |
858 // | |
859 // Since readers don't hold a lock, we must make sure that system | |
860 // dictionary entries are only removed at a safepoint (when only one | |
861 // thread is running), and are added to in a safe way (all links must | |
862 // be updated in an MT-safe manner). | |
863 // | |
864 // Callers should be aware that an entry could be added just after | |
865 // _dictionary->bucket(index) is read here, so the caller will not see | |
866 // the new entry. | |
867 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
868 Klass* SystemDictionary::find(Symbol* class_name, |
8667
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
869 Handle class_loader, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
870 Handle protection_domain, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
871 TRAPS) { |
0 | 872 |
556
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
873 // UseNewReflection |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
874 // The result of this call should be consistent with the result |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
875 // of the call to resolve_instance_class_or_null(). |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
876 // See evaluation 6790209 and 4474172 for more details. |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
877 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
8667
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
878 ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(class_loader()); |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
879 |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
880 if (loader_data == NULL) { |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
881 // If the ClassLoaderData has not been setup, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
882 // then the class loader has no entries in the dictionary. |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
883 return NULL; |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
884 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
885 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
886 unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data); |
0 | 887 int d_index = dictionary()->hash_to_index(d_hash); |
888 | |
889 { | |
890 // Note that we have an entry, and entries can be deleted only during GC, | |
891 // so we cannot allow GC to occur while we're holding this entry. | |
892 // We're using a No_Safepoint_Verifier to catch any place where we | |
893 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
894 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
895 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 896 No_Safepoint_Verifier nosafepoint; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
897 return dictionary()->find(d_index, d_hash, class_name, loader_data, |
0 | 898 protection_domain, THREAD); |
899 } | |
900 } | |
901 | |
902 | |
903 // Look for a loaded instance or array klass by name. Do not do any loading. | |
904 // return NULL in case of error. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
905 Klass* SystemDictionary::find_instance_or_array_klass(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
906 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
907 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
908 TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
909 Klass* k = NULL; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
910 assert(class_name != NULL, "class name must be non NULL"); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
911 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
912 if (FieldType::is_array(class_name)) { |
0 | 913 // The name refers to an array. Parse the name. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
914 // dimension and object_key in FieldArrayInfo are assigned as a |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
915 // side-effect of this call |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
916 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
917 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); |
0 | 918 if (t != T_OBJECT) { |
919 k = Universe::typeArrayKlassObj(t); | |
920 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
921 k = SystemDictionary::find(fd.object_key(), class_loader, protection_domain, THREAD); |
0 | 922 } |
923 if (k != NULL) { | |
6983 | 924 k = k->array_klass_or_null(fd.dimension()); |
0 | 925 } |
926 } else { | |
927 k = find(class_name, class_loader, protection_domain, THREAD); | |
928 } | |
929 return k; | |
930 } | |
931 | |
932 // Note: this method is much like resolve_from_stream, but | |
933 // updates no supplemental data structures. | |
934 // TODO consolidate the two methods with a helper routine? | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
935 Klass* SystemDictionary::parse_stream(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
936 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
937 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
938 ClassFileStream* st, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
939 KlassHandle host_klass, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
940 GrowableArray<Handle>* cp_patches, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
941 TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
942 TempNewSymbol parsed_name = NULL; |
0 | 943 |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
944 ClassLoaderData* loader_data; |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
945 if (host_klass.not_null()) { |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
946 // Create a new CLD for anonymous class, that uses the same class loader |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
947 // as the host_klass |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
948 assert(EnableInvokeDynamic, ""); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
949 guarantee(host_klass->class_loader() == class_loader(), "should be the same"); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
950 loader_data = ClassLoaderData::anonymous_class_loader_data(class_loader(), CHECK_NULL); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
951 loader_data->record_dependency(host_klass(), CHECK_NULL); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
952 } else { |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
953 loader_data = ClassLoaderData::class_loader_data(class_loader()); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
954 } |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
955 |
0 | 956 // Parse the stream. Note that we do this even though this klass might |
957 // already be present in the SystemDictionary, otherwise we would not | |
958 // throw potential ClassFormatErrors. | |
959 // | |
960 // Note: "name" is updated. | |
961 | |
962 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
963 loader_data, |
0 | 964 protection_domain, |
710 | 965 host_klass, |
966 cp_patches, | |
0 | 967 parsed_name, |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
875
diff
changeset
|
968 true, |
0 | 969 THREAD); |
970 | |
971 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
972 if (host_klass.not_null() && k.not_null()) { |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
973 assert(EnableInvokeDynamic, ""); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
974 k->set_host_klass(host_klass()); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
975 // If it's anonymous, initialize it now, since nobody else will. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
976 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
977 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
978 MutexLocker mu_r(Compile_lock, THREAD); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
979 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
980 // Add to class hierarchy, initialize vtables, and do possible |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
981 // deoptimizations. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
982 add_to_hierarchy(k, CHECK_NULL); // No exception, but can block |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
983 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
984 // But, do not add to system dictionary. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
985 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
986 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
987 // Rewrite and patch constant pool here. |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
988 k->link_class(CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
989 if (cp_patches != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
990 k->constants()->patch_resolved_references(cp_patches); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
991 } |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
992 k->eager_initialize(CHECK_NULL); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
993 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
994 // notify jvmti |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
995 if (JvmtiExport::should_post_class_load()) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
996 assert(THREAD->is_Java_thread(), "thread->is_Java_thread()"); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
997 JvmtiExport::post_class_load((JavaThread *) THREAD, k()); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
998 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
999 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1000 assert(host_klass.not_null() || cp_patches == NULL, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1001 "cp_patches only found with host_klass"); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1002 |
0 | 1003 return k(); |
1004 } | |
1005 | |
1006 // Add a klass to the system from a stream (called by jni_DefineClass and | |
1007 // JVM_DefineClass). | |
1008 // Note: class_name can be NULL. In that case we do not know the name of | |
1009 // the class until we have parsed the stream. | |
1010 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1011 Klass* SystemDictionary::resolve_from_stream(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1012 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1013 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1014 ClassFileStream* st, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1015 bool verify, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1016 TRAPS) { |
0 | 1017 |
514 | 1018 // Classloaders that support parallelism, e.g. bootstrap classloader, |
1019 // or all classloaders with UnsyncloadClass do not acquire lock here | |
1020 bool DoObjectLock = true; | |
1021 if (is_parallelCapable(class_loader)) { | |
1022 DoObjectLock = false; | |
1023 } | |
1024 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1025 ClassLoaderData* loader_data = register_loader(class_loader, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1026 |
514 | 1027 // Make sure we are synchronized on the class loader before we proceed |
0 | 1028 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); |
1029 check_loader_lock_contention(lockObject, THREAD); | |
514 | 1030 ObjectLocker ol(lockObject, THREAD, DoObjectLock); |
0 | 1031 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1032 TempNewSymbol parsed_name = NULL; |
0 | 1033 |
1034 // Parse the stream. Note that we do this even though this klass might | |
1035 // already be present in the SystemDictionary, otherwise we would not | |
1036 // throw potential ClassFormatErrors. | |
1037 // | |
1038 // Note: "name" is updated. | |
1039 | |
1040 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1041 loader_data, |
0 | 1042 protection_domain, |
1043 parsed_name, | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
875
diff
changeset
|
1044 verify, |
0 | 1045 THREAD); |
1046 | |
1047 const char* pkg = "java/"; | |
1048 if (!HAS_PENDING_EXCEPTION && | |
1049 !class_loader.is_null() && | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1050 parsed_name != NULL && |
0 | 1051 !strncmp((const char*)parsed_name->bytes(), pkg, strlen(pkg))) { |
1052 // It is illegal to define classes in the "java." package from | |
1053 // JVM_DefineClass or jni_DefineClass unless you're the bootclassloader | |
1054 ResourceMark rm(THREAD); | |
1055 char* name = parsed_name->as_C_string(); | |
1056 char* index = strrchr(name, '/'); | |
1057 *index = '\0'; // chop to just the package name | |
1058 while ((index = strchr(name, '/')) != NULL) { | |
1059 *index = '.'; // replace '/' with '.' in package name | |
1060 } | |
1061 const char* fmt = "Prohibited package name: %s"; | |
1062 size_t len = strlen(fmt) + strlen(name); | |
1063 char* message = NEW_RESOURCE_ARRAY(char, len); | |
1064 jio_snprintf(message, len, fmt, name); | |
1065 Exceptions::_throw_msg(THREAD_AND_LOCATION, | |
1066 vmSymbols::java_lang_SecurityException(), message); | |
1067 } | |
1068 | |
1069 if (!HAS_PENDING_EXCEPTION) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1070 assert(parsed_name != NULL, "Sanity"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1071 assert(class_name == NULL || class_name == parsed_name, "name mismatch"); |
0 | 1072 // Verification prevents us from creating names with dots in them, this |
1073 // asserts that that's the case. | |
1074 assert(is_internal_format(parsed_name), | |
1075 "external class name format used internally"); | |
1076 | |
1077 // Add class just loaded | |
514 | 1078 // If a class loader supports parallel classloading handle parallel define requests |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1079 // find_or_define_instance_class may return a different InstanceKlass |
514 | 1080 if (is_parallelCapable(class_loader)) { |
1081 k = find_or_define_instance_class(class_name, class_loader, k, THREAD); | |
1082 } else { | |
1083 define_instance_class(k, THREAD); | |
1084 } | |
0 | 1085 } |
1086 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1087 // Make sure we have an entry in the SystemDictionary on success |
0 | 1088 debug_only( { |
1089 if (!HAS_PENDING_EXCEPTION) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1090 assert(parsed_name != NULL, "parsed_name is still null?"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1091 Symbol* h_name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1092 ClassLoaderData *defining_loader_data = k->class_loader_data(); |
0 | 1093 |
1094 MutexLocker mu(SystemDictionary_lock, THREAD); | |
1095 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1096 Klass* check = find_class(parsed_name, loader_data); |
0 | 1097 assert(check == k(), "should be present in the dictionary"); |
1098 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1099 Klass* check2 = find_class(h_name, defining_loader_data); |
0 | 1100 assert(check == check2, "name inconsistancy in SystemDictionary"); |
1101 } | |
1102 } ); | |
1103 | |
1104 return k(); | |
1105 } | |
1106 | |
1107 | |
6197 | 1108 void SystemDictionary::set_shared_dictionary(HashtableBucket<mtClass>* t, int length, |
0 | 1109 int number_of_entries) { |
6197 | 1110 assert(length == _nof_buckets * sizeof(HashtableBucket<mtClass>), |
0 | 1111 "bad shared dictionary size."); |
1112 _shared_dictionary = new Dictionary(_nof_buckets, t, number_of_entries); | |
1113 } | |
1114 | |
1115 | |
1116 // If there is a shared dictionary, then find the entry for the | |
1117 // given shared system class, if any. | |
1118 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1119 Klass* SystemDictionary::find_shared_class(Symbol* class_name) { |
0 | 1120 if (shared_dictionary() != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1121 unsigned int d_hash = shared_dictionary()->compute_hash(class_name, NULL); |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1122 int d_index = shared_dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1123 |
0 | 1124 return shared_dictionary()->find_shared_class(d_index, d_hash, class_name); |
1125 } else { | |
1126 return NULL; | |
1127 } | |
1128 } | |
1129 | |
1130 | |
1131 // Load a class from the shared spaces (found through the shared system | |
1132 // dictionary). Force the superclass and all interfaces to be loaded. | |
1133 // Update the class definition to include sibling classes and no | |
1134 // subclasses (yet). [Classes in the shared space are not part of the | |
1135 // object hierarchy until loaded.] | |
1136 | |
1137 instanceKlassHandle SystemDictionary::load_shared_class( | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1138 Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 1139 instanceKlassHandle ik (THREAD, find_shared_class(class_name)); |
1140 return load_shared_class(ik, class_loader, THREAD); | |
1141 } | |
1142 | |
1143 // Note well! Changes to this method may affect oop access order | |
1144 // in the shared archive. Please take care to not make changes that | |
1145 // adversely affect cold start time by changing the oop access order | |
1146 // that is specified in dump.cpp MarkAndMoveOrderedReadOnly and | |
1147 // MarkAndMoveOrderedReadWrite closures. | |
1148 instanceKlassHandle SystemDictionary::load_shared_class( | |
1149 instanceKlassHandle ik, Handle class_loader, TRAPS) { | |
1150 assert(class_loader.is_null(), "non-null classloader for shared class?"); | |
1151 if (ik.not_null()) { | |
1152 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1153 Symbol* class_name = ik->name(); |
0 | 1154 |
1155 // Found the class, now load the superclass and interfaces. If they | |
1156 // are shared, add them to the main system dictionary and reset | |
1157 // their hierarchy references (supers, subs, and interfaces). | |
1158 | |
1159 if (ik->super() != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1160 Symbol* cn = ik->super()->name(); |
0 | 1161 resolve_super_or_fail(class_name, cn, |
1162 class_loader, Handle(), true, CHECK_(nh)); | |
1163 } | |
1164 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1165 Array<Klass*>* interfaces = ik->local_interfaces(); |
0 | 1166 int num_interfaces = interfaces->length(); |
1167 for (int index = 0; index < num_interfaces; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1168 Klass* k = interfaces->at(index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1169 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1170 // Note: can not use InstanceKlass::cast here because |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1171 // interfaces' InstanceKlass's C++ vtbls haven't been |
0 | 1172 // reinitialized yet (they will be once the interface classes |
1173 // are loaded) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1174 Symbol* name = k->name(); |
0 | 1175 resolve_super_or_fail(class_name, name, class_loader, Handle(), false, CHECK_(nh)); |
1176 } | |
1177 | |
1178 // Adjust methods to recover missing data. They need addresses for | |
1179 // interpreter entry points and their default native method address | |
1180 // must be reset. | |
1181 | |
1182 // Updating methods must be done under a lock so multiple | |
1183 // threads don't update these in parallel | |
1184 // Shared classes are all currently loaded by the bootstrap | |
1185 // classloader, so this will never cause a deadlock on | |
1186 // a custom class loader lock. | |
1187 | |
1188 { | |
1189 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); | |
1190 check_loader_lock_contention(lockObject, THREAD); | |
1191 ObjectLocker ol(lockObject, THREAD, true); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1192 ik->restore_unshareable_info(CHECK_(nh)); |
0 | 1193 } |
1194 | |
1195 if (TraceClassLoading) { | |
1196 ResourceMark rm; | |
1197 tty->print("[Loaded %s", ik->external_name()); | |
1198 tty->print(" from shared objects file"); | |
1199 tty->print_cr("]"); | |
1200 } | |
1201 // notify a class loaded from shared object | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1202 ClassLoadingService::notify_class_loaded(InstanceKlass::cast(ik()), |
0 | 1203 true /* shared class */); |
1204 } | |
1205 return ik; | |
1206 } | |
1207 | |
1208 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1209 instanceKlassHandle SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 1210 instanceKlassHandle nh = instanceKlassHandle(); // null Handle |
1211 if (class_loader.is_null()) { | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1212 |
0 | 1213 // Search the shared system dictionary for classes preloaded into the |
1214 // shared spaces. | |
1215 instanceKlassHandle k; | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1216 { |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1217 PerfTraceTime vmtimer(ClassLoader::perf_shared_classload_time()); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1218 k = load_shared_class(class_name, class_loader, THREAD); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1219 } |
0 | 1220 |
1221 if (k.is_null()) { | |
1222 // Use VM class loader | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1223 PerfTraceTime vmtimer(ClassLoader::perf_sys_classload_time()); |
0 | 1224 k = ClassLoader::load_classfile(class_name, CHECK_(nh)); |
1225 } | |
1226 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1227 // find_or_define_instance_class may return a different InstanceKlass |
0 | 1228 if (!k.is_null()) { |
1229 k = find_or_define_instance_class(class_name, class_loader, k, CHECK_(nh)); | |
1230 } | |
1231 return k; | |
1232 } else { | |
1233 // Use user specified class loader to load class. Call loadClass operation on class_loader. | |
1234 ResourceMark rm(THREAD); | |
1235 | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1236 assert(THREAD->is_Java_thread(), "must be a JavaThread"); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1237 JavaThread* jt = (JavaThread*) THREAD; |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1238 |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1239 PerfClassTraceTime vmtimer(ClassLoader::perf_app_classload_time(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1240 ClassLoader::perf_app_classload_selftime(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1241 ClassLoader::perf_app_classload_count(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1242 jt->get_thread_stat()->perf_recursion_counts_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1243 jt->get_thread_stat()->perf_timers_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1244 PerfClassTraceTime::CLASS_LOAD); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1245 |
0 | 1246 Handle s = java_lang_String::create_from_symbol(class_name, CHECK_(nh)); |
1247 // Translate to external class name format, i.e., convert '/' chars to '.' | |
1248 Handle string = java_lang_String::externalize_classname(s, CHECK_(nh)); | |
1249 | |
1250 JavaValue result(T_OBJECT); | |
1251 | |
1142 | 1252 KlassHandle spec_klass (THREAD, SystemDictionary::ClassLoader_klass()); |
0 | 1253 |
514 | 1254 // Call public unsynchronized loadClass(String) directly for all class loaders |
1255 // for parallelCapable class loaders. JDK >=7, loadClass(String, boolean) will | |
1256 // acquire a class-name based lock rather than the class loader object lock. | |
1257 // JDK < 7 already acquire the class loader lock in loadClass(String, boolean), | |
1258 // so the call to loadClassInternal() was not required. | |
1259 // | |
1260 // UnsyncloadClass flag means both call loadClass(String) and do | |
1261 // not acquire the class loader lock even for class loaders that are | |
1262 // not parallelCapable. This was a risky transitional | |
1263 // flag for diagnostic purposes only. It is risky to call | |
0 | 1264 // custom class loaders without synchronization. |
1265 // WARNING If a custom class loader does NOT synchronizer findClass, or callers of | |
514 | 1266 // findClass, the UnsyncloadClass flag risks unexpected timing bugs in the field. |
0 | 1267 // Do NOT assume this will be supported in future releases. |
514 | 1268 // |
1269 // Added MustCallLoadClassInternal in case we discover in the field | |
1270 // a customer that counts on this call | |
1271 if (MustCallLoadClassInternal && has_loadClassInternal()) { | |
0 | 1272 JavaCalls::call_special(&result, |
1273 class_loader, | |
1274 spec_klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1275 vmSymbols::loadClassInternal_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1276 vmSymbols::string_class_signature(), |
0 | 1277 string, |
1278 CHECK_(nh)); | |
1279 } else { | |
1280 JavaCalls::call_virtual(&result, | |
1281 class_loader, | |
1282 spec_klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1283 vmSymbols::loadClass_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1284 vmSymbols::string_class_signature(), |
0 | 1285 string, |
1286 CHECK_(nh)); | |
1287 } | |
1288 | |
1289 assert(result.get_type() == T_OBJECT, "just checking"); | |
1290 oop obj = (oop) result.get_jobject(); | |
1291 | |
1292 // Primitive classes return null since forName() can not be | |
1293 // used to obtain any of the Class objects representing primitives or void | |
1294 if ((obj != NULL) && !(java_lang_Class::is_primitive(obj))) { | |
1295 instanceKlassHandle k = | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1296 instanceKlassHandle(THREAD, java_lang_Class::as_Klass(obj)); |
0 | 1297 // For user defined Java class loaders, check that the name returned is |
1298 // the same as that requested. This check is done for the bootstrap | |
1299 // loader when parsing the class file. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1300 if (class_name == k->name()) { |
0 | 1301 return k; |
1302 } | |
1303 } | |
1304 // Class is not found or has the wrong name, return NULL | |
1305 return nh; | |
1306 } | |
1307 } | |
1308 | |
1309 void SystemDictionary::define_instance_class(instanceKlassHandle k, TRAPS) { | |
1310 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1311 ClassLoaderData* loader_data = k->class_loader_data(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1312 Handle class_loader_h(THREAD, loader_data->class_loader()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1313 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1314 for (uintx it = 0; it < GCExpandToAllocateDelayMillis; it++){} |
0 | 1315 |
514 | 1316 // for bootstrap and other parallel classloaders don't acquire lock, |
1317 // use placeholder token | |
1318 // If a parallelCapable class loader calls define_instance_class instead of | |
1319 // find_or_define_instance_class to get here, we have a timing | |
1320 // hole with systemDictionary updates and check_constraints | |
1321 if (!class_loader_h.is_null() && !is_parallelCapable(class_loader_h)) { | |
0 | 1322 assert(ObjectSynchronizer::current_thread_holds_lock((JavaThread*)THREAD, |
1323 compute_loader_lock_object(class_loader_h, THREAD)), | |
1324 "define called without lock"); | |
1325 } | |
1326 | |
1327 // Check class-loading constraints. Throw exception if violation is detected. | |
1328 // Grabs and releases SystemDictionary_lock | |
1329 // The check_constraints/find_class call and update_dictionary sequence | |
1330 // must be "atomic" for a specific class/classloader pair so we never | |
1331 // define two different instanceKlasses for that class/classloader pair. | |
1332 // Existing classloaders will call define_instance_class with the | |
1333 // classloader lock held | |
1334 // Parallel classloaders will call find_or_define_instance_class | |
1335 // which will require a token to perform the define class | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1336 Symbol* name_h = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1337 unsigned int d_hash = dictionary()->compute_hash(name_h, loader_data); |
0 | 1338 int d_index = dictionary()->hash_to_index(d_hash); |
1339 check_constraints(d_index, d_hash, k, class_loader_h, true, CHECK); | |
1340 | |
6751
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1341 // Register class just loaded with class loader (placed in Vector) |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1342 // Note we do this before updating the dictionary, as this can |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1343 // fail with an OutOfMemoryError (if it does, we will *not* put this |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1344 // class in the dictionary and will not update the class hierarchy). |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1345 // JVMTI FollowReferences needs to find the classes this way. |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1346 if (k->class_loader() != NULL) { |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1347 methodHandle m(THREAD, Universe::loader_addClass_method()); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1348 JavaValue result(T_VOID); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1349 JavaCallArguments args(class_loader_h); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1350 args.push_oop(Handle(THREAD, k->java_mirror())); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1351 JavaCalls::call(&result, m, &args, CHECK); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1352 } |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1353 |
0 | 1354 // Add the new class. We need recompile lock during update of CHA. |
1355 { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1356 unsigned int p_hash = placeholders()->compute_hash(name_h, loader_data); |
0 | 1357 int p_index = placeholders()->hash_to_index(p_hash); |
1358 | |
1359 MutexLocker mu_r(Compile_lock, THREAD); | |
1360 | |
1361 // Add to class hierarchy, initialize vtables, and do possible | |
1362 // deoptimizations. | |
1363 add_to_hierarchy(k, CHECK); // No exception, but can block | |
1364 | |
1365 // Add to systemDictionary - so other classes can see it. | |
1366 // Grabs and releases SystemDictionary_lock | |
1367 update_dictionary(d_index, d_hash, p_index, p_hash, | |
1368 k, class_loader_h, THREAD); | |
1369 } | |
1370 k->eager_initialize(THREAD); | |
1371 | |
1372 // notify jvmti | |
1373 if (JvmtiExport::should_post_class_load()) { | |
1374 assert(THREAD->is_Java_thread(), "thread->is_Java_thread()"); | |
1375 JvmtiExport::post_class_load((JavaThread *) THREAD, k()); | |
1376 | |
1377 } | |
1378 } | |
1379 | |
1380 // Support parallel classloading | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1381 // All parallel class loaders, including bootstrap classloader |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1382 // lock a placeholder entry for this class/class_loader pair |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1383 // to allow parallel defines of different classes for this class loader |
514 | 1384 // With AllowParallelDefine flag==true, in case they do not synchronize around |
1385 // FindLoadedClass/DefineClass, calls, we check for parallel | |
0 | 1386 // loading for them, wait if a defineClass is in progress |
1387 // and return the initial requestor's results | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1388 // This flag does not apply to the bootstrap classloader. |
514 | 1389 // With AllowParallelDefine flag==false, call through to define_instance_class |
1390 // which will throw LinkageError: duplicate class definition. | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1391 // False is the requested default. |
0 | 1392 // For better performance, the class loaders should synchronize |
514 | 1393 // findClass(), i.e. FindLoadedClass/DefineClassIfAbsent or they |
0 | 1394 // potentially waste time reading and parsing the bytestream. |
1395 // Note: VM callers should ensure consistency of k/class_name,class_loader | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1396 instanceKlassHandle SystemDictionary::find_or_define_instance_class(Symbol* class_name, Handle class_loader, instanceKlassHandle k, TRAPS) { |
0 | 1397 |
1398 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1399 Symbol* name_h = k->name(); // passed in class_name may be null |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1400 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1401 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1402 unsigned int d_hash = dictionary()->compute_hash(name_h, loader_data); |
0 | 1403 int d_index = dictionary()->hash_to_index(d_hash); |
1404 | |
1405 // Hold SD lock around find_class and placeholder creation for DEFINE_CLASS | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1406 unsigned int p_hash = placeholders()->compute_hash(name_h, loader_data); |
0 | 1407 int p_index = placeholders()->hash_to_index(p_hash); |
1408 PlaceholderEntry* probe; | |
1409 | |
1410 { | |
1411 MutexLocker mu(SystemDictionary_lock, THREAD); | |
1412 // First check if class already defined | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1413 if (UnsyncloadClass || (is_parallelDefine(class_loader))) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1414 Klass* check = find_class(d_index, d_hash, name_h, loader_data); |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1415 if (check != NULL) { |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1416 return(instanceKlassHandle(THREAD, check)); |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1417 } |
0 | 1418 } |
1419 | |
1420 // Acquire define token for this class/classloader | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1421 probe = placeholders()->find_and_add(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, NULL, THREAD); |
514 | 1422 // Wait if another thread defining in parallel |
1423 // All threads wait - even those that will throw duplicate class: otherwise | |
1424 // caller is surprised by LinkageError: duplicate, but findLoadedClass fails | |
1425 // if other thread has not finished updating dictionary | |
1426 while (probe->definer() != NULL) { | |
1427 SystemDictionary_lock->wait(); | |
1428 } | |
1429 // Only special cases allow parallel defines and can use other thread's results | |
1430 // Other cases fall through, and may run into duplicate defines | |
1431 // caught by finding an entry in the SystemDictionary | |
6983 | 1432 if ((UnsyncloadClass || is_parallelDefine(class_loader)) && (probe->instance_klass() != NULL)) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1433 placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD); |
514 | 1434 SystemDictionary_lock->notify_all(); |
0 | 1435 #ifdef ASSERT |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1436 Klass* check = find_class(d_index, d_hash, name_h, loader_data); |
514 | 1437 assert(check != NULL, "definer missed recording success"); |
0 | 1438 #endif |
6983 | 1439 return(instanceKlassHandle(THREAD, probe->instance_klass())); |
0 | 1440 } else { |
514 | 1441 // This thread will define the class (even if earlier thread tried and had an error) |
1442 probe->set_definer(THREAD); | |
0 | 1443 } |
1444 } | |
1445 | |
1446 define_instance_class(k, THREAD); | |
1447 | |
1448 Handle linkage_exception = Handle(); // null handle | |
1449 | |
1450 // definer must notify any waiting threads | |
1451 { | |
1452 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1453 PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, name_h, loader_data); |
0 | 1454 assert(probe != NULL, "DEFINE_CLASS placeholder lost?"); |
1455 if (probe != NULL) { | |
1456 if (HAS_PENDING_EXCEPTION) { | |
1457 linkage_exception = Handle(THREAD,PENDING_EXCEPTION); | |
1458 CLEAR_PENDING_EXCEPTION; | |
1459 } else { | |
6983 | 1460 probe->set_instance_klass(k()); |
0 | 1461 } |
1462 probe->set_definer(NULL); | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1463 placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD); |
0 | 1464 SystemDictionary_lock->notify_all(); |
1465 } | |
1466 } | |
1467 | |
1468 // Can't throw exception while holding lock due to rank ordering | |
1469 if (linkage_exception() != NULL) { | |
1470 THROW_OOP_(linkage_exception(), nh); // throws exception and returns | |
1471 } | |
1472 | |
1473 return k; | |
1474 } | |
1475 Handle SystemDictionary::compute_loader_lock_object(Handle class_loader, TRAPS) { | |
1476 // If class_loader is NULL we synchronize on _system_loader_lock_obj | |
1477 if (class_loader.is_null()) { | |
1478 return Handle(THREAD, _system_loader_lock_obj); | |
1479 } else { | |
1480 return class_loader; | |
1481 } | |
1482 } | |
1483 | |
1484 // This method is added to check how often we have to wait to grab loader | |
1485 // lock. The results are being recorded in the performance counters defined in | |
1486 // ClassLoader::_sync_systemLoaderLockContentionRate and | |
1487 // ClassLoader::_sync_nonSystemLoaderLockConteionRate. | |
1488 void SystemDictionary::check_loader_lock_contention(Handle loader_lock, TRAPS) { | |
1489 if (!UsePerfData) { | |
1490 return; | |
1491 } | |
1492 | |
1493 assert(!loader_lock.is_null(), "NULL lock object"); | |
1494 | |
1495 if (ObjectSynchronizer::query_lock_ownership((JavaThread*)THREAD, loader_lock) | |
1496 == ObjectSynchronizer::owner_other) { | |
1497 // contention will likely happen, so increment the corresponding | |
1498 // contention counter. | |
1499 if (loader_lock() == _system_loader_lock_obj) { | |
1500 ClassLoader::sync_systemLoaderLockContentionRate()->inc(); | |
1501 } else { | |
1502 ClassLoader::sync_nonSystemLoaderLockContentionRate()->inc(); | |
1503 } | |
1504 } | |
1505 } | |
1506 | |
1507 // ---------------------------------------------------------------------------- | |
1508 // Lookup | |
1509 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1510 Klass* SystemDictionary::find_class(int index, unsigned int hash, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1511 Symbol* class_name, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1512 ClassLoaderData* loader_data) { |
0 | 1513 assert_locked_or_safepoint(SystemDictionary_lock); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1514 assert (index == dictionary()->index_for(class_name, loader_data), |
0 | 1515 "incorrect index?"); |
1516 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1517 Klass* k = dictionary()->find_class(index, hash, class_name, loader_data); |
0 | 1518 return k; |
1519 } | |
1520 | |
1521 | |
1522 // Basic find on classes in the midst of being loaded | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1523 Symbol* SystemDictionary::find_placeholder(Symbol* class_name, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1524 ClassLoaderData* loader_data) { |
0 | 1525 assert_locked_or_safepoint(SystemDictionary_lock); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1526 unsigned int p_hash = placeholders()->compute_hash(class_name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1527 int p_index = placeholders()->hash_to_index(p_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1528 return placeholders()->find_entry(p_index, p_hash, class_name, loader_data); |
0 | 1529 } |
1530 | |
1531 | |
1532 // Used for assertions and verification only | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1533 Klass* SystemDictionary::find_class(Symbol* class_name, ClassLoaderData* loader_data) { |
0 | 1534 #ifndef ASSERT |
1535 guarantee(VerifyBeforeGC || | |
1536 VerifyDuringGC || | |
1537 VerifyBeforeExit || | |
1538 VerifyAfterGC, "too expensive"); | |
1539 #endif | |
1540 assert_locked_or_safepoint(SystemDictionary_lock); | |
1541 | |
1542 // First look in the loaded class array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1543 unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data); |
0 | 1544 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1545 return find_class(d_index, d_hash, class_name, loader_data); |
0 | 1546 } |
1547 | |
1548 | |
1549 // Get the next class in the diictionary. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1550 Klass* SystemDictionary::try_get_next_class() { |
0 | 1551 return dictionary()->try_get_next_class(); |
1552 } | |
1553 | |
1554 | |
1555 // ---------------------------------------------------------------------------- | |
1556 // Update hierachy. This is done before the new klass has been added to the SystemDictionary. The Recompile_lock | |
1557 // is held, to ensure that the compiler is not using the class hierachy, and that deoptimization will kick in | |
1558 // before a new class is used. | |
1559 | |
1560 void SystemDictionary::add_to_hierarchy(instanceKlassHandle k, TRAPS) { | |
1561 assert(k.not_null(), "just checking"); | |
2244
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1562 assert_locked_or_safepoint(Compile_lock); |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1563 |
0 | 1564 // Link into hierachy. Make sure the vtables are initialized before linking into |
1565 k->append_to_sibling_list(); // add to superklass/sibling list | |
1566 k->process_interfaces(THREAD); // handle all "implements" declarations | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1567 k->set_init_state(InstanceKlass::loaded); |
0 | 1568 // Now flush all code that depended on old class hierarchy. |
1569 // Note: must be done *after* linking k into the hierarchy (was bug 12/9/97) | |
1570 // Also, first reinitialize vtable because it may have gotten out of synch | |
1571 // while the new class wasn't connected to the class hierarchy. | |
1572 Universe::flush_dependents_on(k); | |
1573 } | |
1574 | |
1575 | |
1576 // ---------------------------------------------------------------------------- | |
1577 // GC support | |
1578 | |
1579 // Following roots during mark-sweep is separated in two phases. | |
1580 // | |
1581 // The first phase follows preloaded classes and all other system | |
1582 // classes, since these will never get unloaded anyway. | |
1583 // | |
1584 // The second phase removes (unloads) unreachable classes from the | |
1585 // system dictionary and follows the remaining classes' contents. | |
1586 | |
1587 void SystemDictionary::always_strong_oops_do(OopClosure* blk) { | |
1588 blk->do_oop(&_java_system_loader); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1589 blk->do_oop(&_system_loader_lock_obj); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1590 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1591 dictionary()->always_strong_oops_do(blk); |
6864
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1592 |
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1593 // Visit extra methods |
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1594 invoke_method_table()->oops_do(blk); |
0 | 1595 } |
1596 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1597 void SystemDictionary::always_strong_classes_do(KlassClosure* closure) { |
0 | 1598 // Follow all system classes and temporary placeholders in dictionary |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1599 dictionary()->always_strong_classes_do(closure); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1600 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1601 // Placeholders. These represent classes we're actively loading. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1602 placeholders()->classes_do(closure); |
0 | 1603 } |
1604 | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1605 // Calculate a "good" systemdictionary size based |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1606 // on predicted or current loaded classes count |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1607 int SystemDictionary::calculate_systemdictionary_size(int classcount) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1608 int newsize = _old_default_sdsize; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1609 if ((classcount > 0) && !DumpSharedSpaces) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1610 int desiredsize = classcount/_average_depth_goal; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1611 for (newsize = _primelist[_sdgeneration]; _sdgeneration < _prime_array_size -1; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1612 newsize = _primelist[++_sdgeneration]) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1613 if (desiredsize <= newsize) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1614 break; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1615 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1616 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1617 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1618 return newsize; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1619 } |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1620 // Assumes classes in the SystemDictionary are only unloaded at a safepoint |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1621 // Note: anonymous classes are not in the SD. |
0 | 1622 bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1623 // First, mark for unload all ClassLoaderData referencing a dead class loader. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1624 bool has_dead_loaders = ClassLoaderDataGraph::do_unloading(is_alive); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1625 bool unloading_occurred = false; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1626 if (has_dead_loaders) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1627 unloading_occurred = dictionary()->do_unloading(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1628 constraints()->purge_loader_constraints(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1629 resolution_errors()->purge_resolution_errors(); |
0 | 1630 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1631 return unloading_occurred; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1632 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1633 |
0 | 1634 void SystemDictionary::oops_do(OopClosure* f) { |
1635 f->do_oop(&_java_system_loader); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1636 f->do_oop(&_system_loader_lock_obj); |
0 | 1637 |
1638 // Adjust dictionary | |
1639 dictionary()->oops_do(f); | |
1640 | |
710 | 1641 // Visit extra methods |
1903 | 1642 invoke_method_table()->oops_do(f); |
0 | 1643 } |
1644 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1645 // Extended Class redefinition support. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1646 // If one of these classes is replaced, we need to replace it in these places. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1647 // KlassClosure::do_klass should take the address of a class but we can |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1648 // change that later. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1649 void SystemDictionary::preloaded_classes_do(KlassClosure* f) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1650 for (int k = (int)FIRST_WKID; k < (int)WKID_LIMIT; k++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1651 f->do_klass(_well_known_klasses[k]); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1652 } |
0 | 1653 |
1654 { | |
1655 for (int i = 0; i < T_VOID+1; i++) { | |
1656 if (_box_klasses[i] != NULL) { | |
1657 assert(i >= T_BOOLEAN, "checking"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1658 f->do_klass(_box_klasses[i]); |
0 | 1659 } |
1660 } | |
1661 } | |
1662 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1663 FilteredFieldsMap::classes_do(f); |
0 | 1664 } |
1665 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1666 void SystemDictionary::lazily_loaded_classes_do(KlassClosure* f) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1667 f->do_klass(_abstract_ownable_synchronizer_klass); |
0 | 1668 } |
1669 | |
1670 // Just the classes from defining class loaders | |
1671 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1672 void SystemDictionary::classes_do(void f(Klass*)) { |
0 | 1673 dictionary()->classes_do(f); |
1674 } | |
1675 | |
1676 // Added for initialize_itable_for_klass | |
1677 // Just the classes from defining class loaders | |
1678 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1679 void SystemDictionary::classes_do(void f(Klass*, TRAPS), TRAPS) { |
0 | 1680 dictionary()->classes_do(f, CHECK); |
1681 } | |
1682 | |
1683 // All classes, and their class loaders | |
1684 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1685 void SystemDictionary::classes_do(void f(Klass*, ClassLoaderData*)) { |
0 | 1686 dictionary()->classes_do(f); |
1687 } | |
1688 | |
1689 // All classes, and their class loaders | |
1690 // (added for helpers that use HandleMarks and ResourceMarks) | |
1691 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1692 void SystemDictionary::classes_do(void f(Klass*, ClassLoaderData*, TRAPS), TRAPS) { |
0 | 1693 dictionary()->classes_do(f, CHECK); |
1694 } | |
1695 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1696 void SystemDictionary::placeholders_do(void f(Symbol*)) { |
0 | 1697 placeholders()->entries_do(f); |
1698 } | |
1699 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1700 void SystemDictionary::methods_do(void f(Method*)) { |
0 | 1701 dictionary()->methods_do(f); |
1903 | 1702 invoke_method_table()->methods_do(f); |
0 | 1703 } |
1704 | |
1705 // ---------------------------------------------------------------------------- | |
1706 // Lazily load klasses | |
1707 | |
1708 void SystemDictionary::load_abstract_ownable_synchronizer_klass(TRAPS) { | |
1709 assert(JDK_Version::is_gte_jdk16x_version(), "Must be JDK 1.6 or later"); | |
1710 | |
1711 // if multiple threads calling this function, only one thread will load | |
1712 // the class. The other threads will find the loaded version once the | |
1713 // class is loaded. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1714 Klass* aos = _abstract_ownable_synchronizer_klass; |
0 | 1715 if (aos == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1716 Klass* k = resolve_or_fail(vmSymbols::java_util_concurrent_locks_AbstractOwnableSynchronizer(), true, CHECK); |
0 | 1717 // Force a fence to prevent any read before the write completes |
1718 OrderAccess::fence(); | |
1719 _abstract_ownable_synchronizer_klass = k; | |
1720 } | |
1721 } | |
1722 | |
1723 // ---------------------------------------------------------------------------- | |
1724 // Initialization | |
1725 | |
1726 void SystemDictionary::initialize(TRAPS) { | |
1727 // Allocate arrays | |
1728 assert(dictionary() == NULL, | |
1729 "SystemDictionary should only be initialized once"); | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1730 _sdgeneration = 0; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1731 _dictionary = new Dictionary(calculate_systemdictionary_size(PredictedLoadedClassCount)); |
1903 | 1732 _placeholders = new PlaceholderTable(_nof_buckets); |
0 | 1733 _number_of_modifications = 0; |
1903 | 1734 _loader_constraints = new LoaderConstraintTable(_loader_constraint_size); |
1735 _resolution_errors = new ResolutionErrorTable(_resolution_error_size); | |
1736 _invoke_method_table = new SymbolPropertyTable(_invoke_method_size); | |
0 | 1737 |
1738 // Allocate private object used as system class loader lock | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1739 _system_loader_lock_obj = oopFactory::new_intArray(0, CHECK); |
0 | 1740 // Initialize basic classes |
1741 initialize_preloaded_classes(CHECK); | |
1742 } | |
1743 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1744 // Compact table of directions on the initialization of klasses: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1745 static const short wk_init_info[] = { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1746 #define WK_KLASS_INIT_INFO(name, symbol, option) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1747 ( ((int)vmSymbols::VM_SYMBOL_ENUM_NAME(symbol) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1748 << SystemDictionary::CEIL_LG_OPTION_LIMIT) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1749 | (int)SystemDictionary::option ), |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1750 WK_KLASSES_DO(WK_KLASS_INIT_INFO) |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1751 #undef WK_KLASS_INIT_INFO |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1752 0 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1753 }; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1754 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1755 bool SystemDictionary::initialize_wk_klass(WKID id, int init_opt, TRAPS) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1756 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1757 int info = wk_init_info[id - FIRST_WKID]; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1758 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1759 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1760 Klass** klassp = &_well_known_klasses[id]; |
2460 | 1761 bool must_load = (init_opt < SystemDictionary::Opt); |
7951 | 1762 if ((*klassp) == NULL) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1763 if (must_load) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1764 (*klassp) = resolve_or_fail(symbol, true, CHECK_0); // load required class |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1765 } else { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1766 (*klassp) = resolve_or_null(symbol, CHECK_0); // load optional klass |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1767 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1768 } |
2460 | 1769 return ((*klassp) != NULL); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1770 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1771 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1772 void SystemDictionary::initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1773 assert((int)start_id <= (int)limit_id, "IDs are out of order!"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1774 for (int id = (int)start_id; id < (int)limit_id; id++) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1775 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1776 int info = wk_init_info[id - FIRST_WKID]; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1777 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1778 int opt = (info & right_n_bits(CEIL_LG_OPTION_LIMIT)); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1779 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1780 initialize_wk_klass((WKID)id, opt, CHECK); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1781 } |
710 | 1782 |
1783 // move the starting value forward to the limit: | |
1784 start_id = limit_id; | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1785 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1786 |
0 | 1787 void SystemDictionary::initialize_preloaded_classes(TRAPS) { |
1142 | 1788 assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once"); |
0 | 1789 // Preload commonly used klasses |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1790 WKID scan = FIRST_WKID; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1791 // first do Object, then String, Class |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1792 if (UseSharedSpaces) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1793 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Object_klass), scan, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1794 // Initialize the constant pool for the Object_class |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1795 InstanceKlass* ik = InstanceKlass::cast(Object_klass()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1796 ik->constants()->restore_unshareable_info(CHECK); |
6733
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
1797 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1798 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1799 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1800 } |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1801 |
6057 | 1802 // Calculate offsets for String and Class classes since they are loaded and |
1803 // can be used after this point. | |
1804 java_lang_String::compute_offsets(); | |
3938 | 1805 java_lang_Class::compute_offsets(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1806 |
0 | 1807 // Fixup mirrors for classes loaded before java.lang.Class. |
1808 // These calls iterate over the objects currently in the perm gen | |
1809 // so calling them at this point is matters (not before when there | |
1810 // are fewer objects and not later after there are more objects | |
1811 // in the perm gen. | |
1812 Universe::initialize_basic_type_mirrors(CHECK); | |
1813 Universe::fixup_mirrors(CHECK); | |
1814 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1815 // do a bunch more: |
1142 | 1816 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); |
0 | 1817 |
1818 // Preload ref klasses and set reference types | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1819 InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
1820 InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); |
0 | 1821 |
1142 | 1822 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1823 InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1824 InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1825 InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1826 InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1827 |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1828 // JSR 292 classes |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1829 WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
3785
diff
changeset
|
1830 WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass); |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1831 initialize_wk_klasses_until(jsr292_group_start, scan, CHECK); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
1832 if (EnableInvokeDynamic) { |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1833 initialize_wk_klasses_through(jsr292_group_end, scan, CHECK); |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1834 } else { |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1835 // Skip the JSR 292 classes, if not enabled. |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1836 scan = WKID(jsr292_group_end + 1); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
1837 } |
710 | 1838 |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1839 initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK); |
0 | 1840 |
1142 | 1841 _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass); |
1842 _box_klasses[T_CHAR] = WK_KLASS(Character_klass); | |
1843 _box_klasses[T_FLOAT] = WK_KLASS(Float_klass); | |
1844 _box_klasses[T_DOUBLE] = WK_KLASS(Double_klass); | |
1845 _box_klasses[T_BYTE] = WK_KLASS(Byte_klass); | |
1846 _box_klasses[T_SHORT] = WK_KLASS(Short_klass); | |
1847 _box_klasses[T_INT] = WK_KLASS(Integer_klass); | |
1848 _box_klasses[T_LONG] = WK_KLASS(Long_klass); | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1849 //_box_klasses[T_OBJECT] = WK_KLASS(object_klass); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1850 //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); |
0 | 1851 |
1852 { // Compute whether we should use loadClass or loadClassInternal when loading classes. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1853 Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature()); |
0 | 1854 _has_loadClassInternal = (method != NULL); |
1855 } | |
1856 { // Compute whether we should use checkPackageAccess or NOT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1857 Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); |
0 | 1858 _has_checkPackageAccess = (method != NULL); |
1859 } | |
1860 } | |
1861 | |
1862 // Tells if a given klass is a box (wrapper class, such as java.lang.Integer). | |
1863 // If so, returns the basic type it holds. If not, returns T_OBJECT. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1864 BasicType SystemDictionary::box_klass_type(Klass* k) { |
0 | 1865 assert(k != NULL, ""); |
1866 for (int i = T_BOOLEAN; i < T_VOID+1; i++) { | |
1867 if (_box_klasses[i] == k) | |
1868 return (BasicType)i; | |
1869 } | |
1870 return T_OBJECT; | |
1871 } | |
1872 | |
1873 // Constraints on class loaders. The details of the algorithm can be | |
1874 // found in the OOPSLA'98 paper "Dynamic Class Loading in the Java | |
1875 // Virtual Machine" by Sheng Liang and Gilad Bracha. The basic idea is | |
1876 // that the system dictionary needs to maintain a set of contraints that | |
1877 // must be satisfied by all classes in the dictionary. | |
1878 // if defining is true, then LinkageError if already in systemDictionary | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1879 // if initiating loader, then ok if InstanceKlass matches existing entry |
0 | 1880 |
1881 void SystemDictionary::check_constraints(int d_index, unsigned int d_hash, | |
1882 instanceKlassHandle k, | |
1883 Handle class_loader, bool defining, | |
1884 TRAPS) { | |
1885 const char *linkage_error = NULL; | |
1886 { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1887 Symbol* name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1888 ClassLoaderData *loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1889 |
0 | 1890 MutexLocker mu(SystemDictionary_lock, THREAD); |
1891 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1892 Klass* check = find_class(d_index, d_hash, name, loader_data); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1893 if (check != (Klass*)NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1894 // if different InstanceKlass - duplicate class definition, |
0 | 1895 // else - ok, class loaded by a different thread in parallel, |
1896 // we should only have found it if it was done loading and ok to use | |
1897 // system dictionary only holds instance classes, placeholders | |
1898 // also holds array classes | |
1899 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1900 assert(check->oop_is_instance(), "noninstance in systemdictionary"); |
0 | 1901 if ((defining == true) || (k() != check)) { |
1902 linkage_error = "loader (instance of %s): attempted duplicate class " | |
1903 "definition for name: \"%s\""; | |
1904 } else { | |
1905 return; | |
1906 } | |
1907 } | |
1908 | |
1909 #ifdef ASSERT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1910 Symbol* ph_check = find_placeholder(name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1911 assert(ph_check == NULL || ph_check == name, "invalid symbol"); |
0 | 1912 #endif |
1913 | |
1914 if (linkage_error == NULL) { | |
1915 if (constraints()->check_or_update(k, class_loader, name) == false) { | |
1916 linkage_error = "loader constraint violation: loader (instance of %s)" | |
1917 " previously initiated loading for a different type with name \"%s\""; | |
1918 } | |
1919 } | |
1920 } | |
1921 | |
1922 // Throw error now if needed (cannot throw while holding | |
1923 // SystemDictionary_lock because of rank ordering) | |
1924 | |
1925 if (linkage_error) { | |
1926 ResourceMark rm(THREAD); | |
1927 const char* class_loader_name = loader_name(class_loader()); | |
1928 char* type_name = k->name()->as_C_string(); | |
1929 size_t buflen = strlen(linkage_error) + strlen(class_loader_name) + | |
1930 strlen(type_name); | |
1931 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
1932 jio_snprintf(buf, buflen, linkage_error, class_loader_name, type_name); | |
1933 THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); | |
1934 } | |
1935 } | |
1936 | |
1937 | |
1938 // Update system dictionary - done after check_constraint and add_to_hierachy | |
1939 // have been called. | |
1940 void SystemDictionary::update_dictionary(int d_index, unsigned int d_hash, | |
1941 int p_index, unsigned int p_hash, | |
1942 instanceKlassHandle k, | |
1943 Handle class_loader, | |
1944 TRAPS) { | |
1945 // Compile_lock prevents systemDictionary updates during compilations | |
1946 assert_locked_or_safepoint(Compile_lock); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1947 Symbol* name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1948 ClassLoaderData *loader_data = class_loader_data(class_loader); |
0 | 1949 |
1950 { | |
1951 MutexLocker mu1(SystemDictionary_lock, THREAD); | |
1952 | |
1953 // See whether biased locking is enabled and if so set it for this | |
1954 // klass. | |
1955 // Note that this must be done past the last potential blocking | |
1956 // point / safepoint. We enable biased locking lazily using a | |
1957 // VM_Operation to iterate the SystemDictionary and installing the | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1958 // biasable mark word into each InstanceKlass's prototype header. |
0 | 1959 // To avoid race conditions where we accidentally miss enabling the |
1960 // optimization for one class in the process of being added to the | |
1961 // dictionary, we must not safepoint after the test of | |
1962 // BiasedLocking::enabled(). | |
1963 if (UseBiasedLocking && BiasedLocking::enabled()) { | |
1964 // Set biased locking bit for all loaded classes; it will be | |
1965 // cleared if revocation occurs too often for this type | |
1966 // NOTE that we must only do this when the class is initally | |
1967 // defined, not each time it is referenced from a new class loader | |
1968 if (k->class_loader() == class_loader()) { | |
1969 k->set_prototype_header(markOopDesc::biased_locking_prototype()); | |
1970 } | |
1971 } | |
1972 | |
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1973 // Assign a classid if one has not already been assigned. The |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1974 // counter does not need to be atomically incremented since this |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1975 // is only done while holding the SystemDictionary_lock. |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1976 // All loaded classes get a unique ID. |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1977 TRACE_INIT_ID(k); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
1978 |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1979 // Make a new system dictionary entry. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1980 Klass* sd_check = find_class(d_index, d_hash, name, loader_data); |
0 | 1981 if (sd_check == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1982 dictionary()->add_klass(name, loader_data, k); |
0 | 1983 notice_modification(); |
1984 } | |
1985 #ifdef ASSERT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1986 sd_check = find_class(d_index, d_hash, name, loader_data); |
0 | 1987 assert (sd_check != NULL, "should have entry in system dictionary"); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1988 // Note: there may be a placeholder entry: for circularity testing |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1989 // or for parallel defines |
0 | 1990 #endif |
1991 SystemDictionary_lock->notify_all(); | |
1992 } | |
1993 } | |
1994 | |
1995 | |
2244
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1996 // Try to find a class name using the loader constraints. The |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1997 // loader constraints might know about a class that isn't fully loaded |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1998 // yet and these will be ignored. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1999 Klass* SystemDictionary::find_constrained_instance_or_array_klass( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2000 Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 2001 |
2002 // First see if it has been loaded directly. | |
2003 // Force the protection domain to be null. (This removes protection checks.) | |
2004 Handle no_protection_domain; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2005 Klass* klass = find_instance_or_array_klass(class_name, class_loader, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
2006 no_protection_domain, CHECK_NULL); |
0 | 2007 if (klass != NULL) |
2008 return klass; | |
2009 | |
2010 // Now look to see if it has been loaded elsewhere, and is subject to | |
2011 // a loader constraint that would require this loader to return the | |
2012 // klass that is already loaded. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2013 if (FieldType::is_array(class_name)) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2014 // For array classes, their Klass*s are not kept in the |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2015 // constraint table. The element Klass*s are. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2016 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2017 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); |
0 | 2018 if (t != T_OBJECT) { |
2019 klass = Universe::typeArrayKlassObj(t); | |
2020 } else { | |
2021 MutexLocker mu(SystemDictionary_lock, THREAD); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2022 klass = constraints()->find_constrained_klass(fd.object_key(), class_loader); |
0 | 2023 } |
1336 | 2024 // If element class already loaded, allocate array klass |
0 | 2025 if (klass != NULL) { |
6983 | 2026 klass = klass->array_klass_or_null(fd.dimension()); |
0 | 2027 } |
2028 } else { | |
2029 MutexLocker mu(SystemDictionary_lock, THREAD); | |
2030 // Non-array classes are easy: simply check the constraint table. | |
2031 klass = constraints()->find_constrained_klass(class_name, class_loader); | |
2032 } | |
2033 | |
2034 return klass; | |
2035 } | |
2036 | |
2037 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2038 bool SystemDictionary::add_loader_constraint(Symbol* class_name, |
0 | 2039 Handle class_loader1, |
2040 Handle class_loader2, | |
2041 Thread* THREAD) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2042 ClassLoaderData* loader_data1 = class_loader_data(class_loader1); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2043 ClassLoaderData* loader_data2 = class_loader_data(class_loader2); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2044 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2045 Symbol* constraint_name = NULL; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2046 if (!FieldType::is_array(class_name)) { |
1336 | 2047 constraint_name = class_name; |
2048 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2049 // For array classes, their Klass*s are not kept in the |
1336 | 2050 // constraint table. The element classes are. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2051 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2052 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(false)); |
1336 | 2053 // primitive types always pass |
2054 if (t != T_OBJECT) { | |
2055 return true; | |
2056 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2057 constraint_name = fd.object_key(); |
1336 | 2058 } |
2059 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2060 unsigned int d_hash1 = dictionary()->compute_hash(constraint_name, loader_data1); |
0 | 2061 int d_index1 = dictionary()->hash_to_index(d_hash1); |
2062 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2063 unsigned int d_hash2 = dictionary()->compute_hash(constraint_name, loader_data2); |
0 | 2064 int d_index2 = dictionary()->hash_to_index(d_hash2); |
2065 { | |
1336 | 2066 MutexLocker mu_s(SystemDictionary_lock, THREAD); |
0 | 2067 |
1336 | 2068 // Better never do a GC while we're holding these oops |
2069 No_Safepoint_Verifier nosafepoint; | |
0 | 2070 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2071 Klass* klass1 = find_class(d_index1, d_hash1, constraint_name, loader_data1); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2072 Klass* klass2 = find_class(d_index2, d_hash2, constraint_name, loader_data2); |
1336 | 2073 return constraints()->add_entry(constraint_name, klass1, class_loader1, |
2074 klass2, class_loader2); | |
0 | 2075 } |
2076 } | |
2077 | |
2078 // Add entry to resolution error table to record the error when the first | |
2079 // attempt to resolve a reference to a class has failed. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2080 void SystemDictionary::add_resolution_error(constantPoolHandle pool, int which, Symbol* error) { |
0 | 2081 unsigned int hash = resolution_errors()->compute_hash(pool, which); |
2082 int index = resolution_errors()->hash_to_index(hash); | |
2083 { | |
2084 MutexLocker ml(SystemDictionary_lock, Thread::current()); | |
2085 resolution_errors()->add_entry(index, hash, pool, which, error); | |
2086 } | |
2087 } | |
2088 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2089 // Delete a resolution error for RedefineClasses for a constant pool is going away |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2090 void SystemDictionary::delete_resolution_error(ConstantPool* pool) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2091 resolution_errors()->delete_entry(pool); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2092 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2093 |
0 | 2094 // Lookup resolution error table. Returns error if found, otherwise NULL. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2095 Symbol* SystemDictionary::find_resolution_error(constantPoolHandle pool, int which) { |
0 | 2096 unsigned int hash = resolution_errors()->compute_hash(pool, which); |
2097 int index = resolution_errors()->hash_to_index(hash); | |
2098 { | |
2099 MutexLocker ml(SystemDictionary_lock, Thread::current()); | |
2100 ResolutionErrorEntry* entry = resolution_errors()->find_entry(index, hash, pool, which); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2101 return (entry != NULL) ? entry->error() : (Symbol*)NULL; |
0 | 2102 } |
2103 } | |
2104 | |
2105 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2106 // Signature constraints ensure that callers and callees agree about |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2107 // the meaning of type names in their signatures. This routine is the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2108 // intake for constraints. It collects them from several places: |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2109 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2110 // * LinkResolver::resolve_method (if check_access is true) requires |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2111 // that the resolving class (the caller) and the defining class of |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2112 // the resolved method (the callee) agree on each type in the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2113 // method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2114 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2115 // * LinkResolver::resolve_interface_method performs exactly the same |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2116 // checks. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2117 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2118 // * LinkResolver::resolve_field requires that the constant pool |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2119 // attempting to link to a field agree with the field's defining |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2120 // class about the type of the field signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2121 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2122 // * klassVtable::initialize_vtable requires that, when a class |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2123 // overrides a vtable entry allocated by a superclass, that the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2124 // overriding method (i.e., the callee) agree with the superclass |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2125 // on each type in the method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2126 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2127 // * klassItable::initialize_itable requires that, when a class fills |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2128 // in its itables, for each non-abstract method installed in an |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2129 // itable, the method (i.e., the callee) agree with the interface |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2130 // on each type in the method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2131 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2132 // All those methods have a boolean (check_access, checkconstraints) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2133 // which turns off the checks. This is used from specialized contexts |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2134 // such as bootstrapping, dumping, and debugging. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2135 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2136 // No direct constraint is placed between the class and its |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2137 // supertypes. Constraints are only placed along linked relations |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2138 // between callers and callees. When a method overrides or implements |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2139 // an abstract method in a supertype (superclass or interface), the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2140 // constraints are placed as if the supertype were the caller to the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2141 // overriding method. (This works well, since callers to the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2142 // supertype have already established agreement between themselves and |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2143 // the supertype.) As a result of all this, a class can disagree with |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2144 // its supertype about the meaning of a type name, as long as that |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2145 // class neither calls a relevant method of the supertype, nor is |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2146 // called (perhaps via an override) from the supertype. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2147 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2148 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2149 // SystemDictionary::check_signature_loaders(sig, l1, l2) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2150 // |
0 | 2151 // Make sure all class components (including arrays) in the given |
2152 // signature will be resolved to the same class in both loaders. | |
2153 // Returns the name of the type that failed a loader constraint check, or | |
2154 // NULL if no constraint failed. The returned C string needs cleaning up | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2155 // with a ResourceMark in the caller. No exception except OOME is thrown. |
1336 | 2156 // Arrays are not added to the loader constraint table, their elements are. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2157 char* SystemDictionary::check_signature_loaders(Symbol* signature, |
0 | 2158 Handle loader1, Handle loader2, |
2159 bool is_method, TRAPS) { | |
2160 // Nothing to do if loaders are the same. | |
2161 if (loader1() == loader2()) { | |
2162 return NULL; | |
2163 } | |
2164 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2165 ResourceMark rm(THREAD); |
0 | 2166 SignatureStream sig_strm(signature, is_method); |
2167 while (!sig_strm.is_done()) { | |
2168 if (sig_strm.is_object()) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2169 Symbol* s = sig_strm.as_symbol(CHECK_NULL); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2170 Symbol* sig = s; |
0 | 2171 if (!add_loader_constraint(sig, loader1, loader2, THREAD)) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2172 return sig->as_C_string(); |
0 | 2173 } |
2174 } | |
2175 sig_strm.next(); | |
2176 } | |
2177 return NULL; | |
2178 } | |
2179 | |
2180 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2181 methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2182 Symbol* signature, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2183 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2184 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2185 assert(EnableInvokeDynamic, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2186 assert(MethodHandles::is_signature_polymorphic(iid) && |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2187 MethodHandles::is_signature_polymorphic_intrinsic(iid) && |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2188 iid != vmIntrinsics::_invokeGeneric, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2189 err_msg("must be a known MH intrinsic iid=%d: %s", iid, vmIntrinsics::name_at(iid))); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2190 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2191 unsigned int hash = invoke_method_table()->compute_hash(signature, iid); |
710 | 2192 int index = invoke_method_table()->hash_to_index(hash); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2193 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2194 methodHandle m; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2195 if (spe == NULL || spe->method() == NULL) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2196 spe = NULL; |
710 | 2197 // Must create lots of stuff here, but outside of the SystemDictionary lock. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2198 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2199 CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_highest_tier, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2200 methodHandle(), CompileThreshold, "MH", CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2201 |
710 | 2202 // Now grab the lock. We might have to throw away the new method, |
2203 // if a racing thread has managed to install one at the same time. | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2204 { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2205 MutexLocker ml(SystemDictionary_lock, THREAD); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2206 spe = invoke_method_table()->find_entry(index, hash, signature, iid); |
710 | 2207 if (spe == NULL) |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2208 spe = invoke_method_table()->add_entry(index, hash, signature, iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2209 if (spe->method() == NULL) |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2210 spe->set_method(m()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2211 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2212 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2213 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2214 assert(spe != NULL && spe->method() != NULL, ""); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2215 return spe->method(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2216 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2217 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2218 // Helper for unpacking the return value from linkMethod and linkCallSite. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2219 static methodHandle unpack_method_and_appendix(Handle mname, |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2220 KlassHandle accessing_klass, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2221 objArrayHandle appendix_box, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2222 Handle* appendix_result, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2223 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2224 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2225 if (mname.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2226 Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2227 if (vmtarget != NULL && vmtarget->is_method()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2228 Method* m = (Method*)vmtarget; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2229 oop appendix = appendix_box->obj_at(0); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2230 if (TraceMethodHandles) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2231 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2232 tty->print("Linked method="INTPTR_FORMAT": ", m); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2233 m->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2234 if (appendix != NULL) { tty->print("appendix = "); appendix->print(); } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2235 tty->cr(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2236 #endif //PRODUCT |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3245
diff
changeset
|
2237 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2238 (*appendix_result) = Handle(THREAD, appendix); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2239 // the target is stored in the cpCache and if a reference to this |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2240 // MethodName is dropped we need a way to make sure the |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2241 // class_loader containing this method is kept alive. |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2242 // FIXME: the appendix might also preserve this dependency. |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2243 ClassLoaderData* this_key = InstanceKlass::cast(accessing_klass())->class_loader_data(); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2244 this_key->record_dependency(m->method_holder(), CHECK_NULL); // Can throw OOM |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2245 return methodHandle(THREAD, m); |
710 | 2246 } |
2247 } | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2248 THROW_MSG_(vmSymbols::java_lang_LinkageError(), "bad value from MethodHandleNatives", empty); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2249 return empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2250 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2251 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2252 methodHandle SystemDictionary::find_method_handle_invoker(Symbol* name, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2253 Symbol* signature, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2254 KlassHandle accessing_klass, |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2255 Handle *appendix_result, |
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2256 Handle *method_type_result, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2257 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2258 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2259 assert(EnableInvokeDynamic, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2260 assert(!THREAD->is_Compiler_thread(), ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2261 Handle method_type = |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2262 SystemDictionary::find_method_handle_type(signature, accessing_klass, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2263 if (false) { // FIXME: Decide if the Java upcall should resolve signatures. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2264 method_type = java_lang_String::create_from_symbol(signature, CHECK_(empty)); |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2265 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2266 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2267 KlassHandle mh_klass = SystemDictionary::MethodHandle_klass(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2268 int ref_kind = JVM_REF_invokeVirtual; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2269 Handle name_str = StringTable::intern(name, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2270 objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2271 assert(appendix_box->obj_at(0) == NULL, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2272 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2273 // call java.lang.invoke.MethodHandleNatives::linkMethod(... String, MethodType) -> MemberName |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2274 JavaCallArguments args; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2275 args.push_oop(accessing_klass()->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2276 args.push_int(ref_kind); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2277 args.push_oop(mh_klass()->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2278 args.push_oop(name_str()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2279 args.push_oop(method_type()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2280 args.push_oop(appendix_box()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2281 JavaValue result(T_OBJECT); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2282 JavaCalls::call_static(&result, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2283 SystemDictionary::MethodHandleNatives_klass(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2284 vmSymbols::linkMethod_name(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2285 vmSymbols::linkMethod_signature(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2286 &args, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2287 Handle mname(THREAD, (oop) result.get_jobject()); |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2288 (*method_type_result) = method_type; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2289 return unpack_method_and_appendix(mname, accessing_klass, appendix_box, appendix_result, THREAD); |
710 | 2290 } |
2291 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2292 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2293 // Ask Java code to find or construct a java.lang.invoke.MethodType for the given |
710 | 2294 // signature, as interpreted relative to the given class loader. |
2295 // Because of class loader constraints, all method handle usage must be | |
2296 // consistent with this loader. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2297 Handle SystemDictionary::find_method_handle_type(Symbol* signature, |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2298 KlassHandle accessing_klass, |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2299 TRAPS) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2300 Handle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2301 vmIntrinsics::ID null_iid = vmIntrinsics::_none; // distinct from all method handle invoker intrinsics |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2302 unsigned int hash = invoke_method_table()->compute_hash(signature, null_iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2303 int index = invoke_method_table()->hash_to_index(hash); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2304 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, null_iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2305 if (spe != NULL && spe->method_type() != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2306 assert(java_lang_invoke_MethodType::is_instance(spe->method_type()), ""); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2307 return Handle(THREAD, spe->method_type()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2308 } else if (THREAD->is_Compiler_thread()) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2309 warning("SystemDictionary::find_method_handle_type called from compiler thread"); // FIXME |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2310 return Handle(); // do not attempt from within compiler, unless it was cached |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2311 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2312 |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2313 Handle class_loader, protection_domain; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2314 bool is_on_bcp = true; // keep this true as long as we can materialize from the boot classloader |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2315 int npts = ArgumentCount(signature).size(); |
1142 | 2316 objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty)); |
710 | 2317 int arg = 0; |
2318 Handle rt; // the return type from the signature | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2319 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2320 for (SignatureStream ss(signature); !ss.is_done(); ss.next()) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2321 oop mirror = NULL; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2322 if (is_on_bcp) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2323 // Note: class_loader & protection_domain are both null at this point. |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2324 mirror = ss.as_java_mirror(class_loader, protection_domain, |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2325 SignatureStream::ReturnNull, CHECK_(empty)); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2326 if (mirror == NULL) { |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2327 // fall back from BCP to accessing_klass |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2328 if (accessing_klass.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2329 class_loader = Handle(THREAD, InstanceKlass::cast(accessing_klass())->class_loader()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2330 protection_domain = Handle(THREAD, InstanceKlass::cast(accessing_klass())->protection_domain()); |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2331 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2332 is_on_bcp = false; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2333 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2334 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2335 if (!is_on_bcp) { |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2336 // Resolve, throwing a real error if it doesn't work. |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2337 mirror = ss.as_java_mirror(class_loader, protection_domain, |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2338 SignatureStream::NCDFError, CHECK_(empty)); |
710 | 2339 } |
2340 if (ss.at_return_type()) | |
2341 rt = Handle(THREAD, mirror); | |
2342 else | |
2343 pts->obj_at_put(arg++, mirror); | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2344 |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2345 // Check accessibility. |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2346 if (ss.is_object() && accessing_klass.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2347 Klass* sel_klass = java_lang_Class::as_Klass(mirror); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2348 mirror = NULL; // safety |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2349 // Emulate ConstantPool::verify_constant_pool_resolve. |
6983 | 2350 if (sel_klass->oop_is_objArray()) |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
2351 sel_klass = ObjArrayKlass::cast(sel_klass)->bottom_klass(); |
6983 | 2352 if (sel_klass->oop_is_instance()) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2353 KlassHandle sel_kh(THREAD, sel_klass); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2354 LinkResolver::check_klass_accessability(accessing_klass, sel_kh, CHECK_(empty)); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2355 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2356 } |
710 | 2357 } |
2358 assert(arg == npts, ""); | |
2359 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2360 // call java.lang.invoke.MethodHandleNatives::findMethodType(Class rt, Class[] pts) -> MethodType |
710 | 2361 JavaCallArguments args(Handle(THREAD, rt())); |
2362 args.push_oop(pts()); | |
2363 JavaValue result(T_OBJECT); | |
2364 JavaCalls::call_static(&result, | |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2365 SystemDictionary::MethodHandleNatives_klass(), |
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2366 vmSymbols::findMethodHandleType_name(), |
2460 | 2367 vmSymbols::findMethodHandleType_signature(), |
710 | 2368 &args, CHECK_(empty)); |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2369 Handle method_type(THREAD, (oop) result.get_jobject()); |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2370 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2371 if (is_on_bcp) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2372 // We can cache this MethodType inside the JVM. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2373 MutexLocker ml(SystemDictionary_lock, THREAD); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2374 spe = invoke_method_table()->find_entry(index, hash, signature, null_iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2375 if (spe == NULL) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2376 spe = invoke_method_table()->add_entry(index, hash, signature, null_iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2377 if (spe->method_type() == NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2378 spe->set_method_type(method_type()); |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2379 } |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2380 } |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2381 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2382 // report back to the caller with the MethodType |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2383 return method_type; |
710 | 2384 } |
2385 | |
1602 | 2386 // Ask Java code to find or construct a method handle constant. |
2387 Handle SystemDictionary::link_method_handle_constant(KlassHandle caller, | |
2388 int ref_kind, //e.g., JVM_REF_invokeVirtual | |
2389 KlassHandle callee, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2390 Symbol* name_sym, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2391 Symbol* signature, |
1602 | 2392 TRAPS) { |
2393 Handle empty; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2394 Handle name = java_lang_String::create_from_symbol(name_sym, CHECK_(empty)); |
1602 | 2395 Handle type; |
2396 if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') { | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2397 type = find_method_handle_type(signature, caller, CHECK_(empty)); |
1602 | 2398 } else { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2399 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2400 SignatureStream ss(signature, false); |
1602 | 2401 if (!ss.is_done()) { |
2402 oop mirror = ss.as_java_mirror(caller->class_loader(), caller->protection_domain(), | |
2403 SignatureStream::NCDFError, CHECK_(empty)); | |
2404 type = Handle(THREAD, mirror); | |
2405 ss.next(); | |
2406 if (!ss.is_done()) type = Handle(); // error! | |
2407 } | |
2408 } | |
2409 if (type.is_null()) { | |
2410 THROW_MSG_(vmSymbols::java_lang_LinkageError(), "bad signature", empty); | |
2411 } | |
2412 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2413 // call java.lang.invoke.MethodHandleNatives::linkMethodHandleConstant(Class caller, int refKind, Class callee, String name, Object type) -> MethodHandle |
1602 | 2414 JavaCallArguments args; |
2415 args.push_oop(caller->java_mirror()); // the referring class | |
2416 args.push_int(ref_kind); | |
2417 args.push_oop(callee->java_mirror()); // the target class | |
2418 args.push_oop(name()); | |
2419 args.push_oop(type()); | |
2420 JavaValue result(T_OBJECT); | |
2421 JavaCalls::call_static(&result, | |
2422 SystemDictionary::MethodHandleNatives_klass(), | |
2423 vmSymbols::linkMethodHandleConstant_name(), | |
2460 | 2424 vmSymbols::linkMethodHandleConstant_signature(), |
1602 | 2425 &args, CHECK_(empty)); |
2426 return Handle(THREAD, (oop) result.get_jobject()); | |
2427 } | |
710 | 2428 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2429 // Ask Java code to find or construct a java.lang.invoke.CallSite for the given |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2430 // name and signature, as interpreted relative to the given class loader. |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2431 methodHandle SystemDictionary::find_dynamic_call_site_invoker(KlassHandle caller, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2432 Handle bootstrap_specifier, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2433 Symbol* name, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2434 Symbol* type, |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2435 Handle *appendix_result, |
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2436 Handle *method_type_result, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2437 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2438 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2439 Handle bsm, info; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2440 if (java_lang_invoke_MethodHandle::is_instance(bootstrap_specifier())) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2441 bsm = bootstrap_specifier; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2442 } else { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2443 assert(bootstrap_specifier->is_objArray(), ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2444 objArrayHandle args(THREAD, (objArrayOop) bootstrap_specifier()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2445 int len = args->length(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2446 assert(len >= 1, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2447 bsm = Handle(THREAD, args->obj_at(0)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2448 if (len > 1) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2449 objArrayOop args1 = oopFactory::new_objArray(SystemDictionary::Object_klass(), len-1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2450 for (int i = 1; i < len; i++) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2451 args1->obj_at_put(i-1, args->obj_at(i)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2452 info = Handle(THREAD, args1); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2453 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2454 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2455 guarantee(java_lang_invoke_MethodHandle::is_instance(bsm()), |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
2456 "caller must supply a valid BSM"); |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
2457 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2458 Handle method_name = java_lang_String::create_from_symbol(name, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2459 Handle method_type = find_method_handle_type(type, caller, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2460 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2461 objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2462 assert(appendix_box->obj_at(0) == NULL, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2463 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2464 // call java.lang.invoke.MethodHandleNatives::linkCallSite(caller, bsm, name, mtype, info, &appendix) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2465 JavaCallArguments args; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2466 args.push_oop(caller->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2467 args.push_oop(bsm()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2468 args.push_oop(method_name()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2469 args.push_oop(method_type()); |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2470 args.push_oop(info()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2471 args.push_oop(appendix_box); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2472 JavaValue result(T_OBJECT); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2473 JavaCalls::call_static(&result, |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2474 SystemDictionary::MethodHandleNatives_klass(), |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2475 vmSymbols::linkCallSite_name(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2476 vmSymbols::linkCallSite_signature(), |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2477 &args, CHECK_(empty)); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2478 Handle mname(THREAD, (oop) result.get_jobject()); |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2479 (*method_type_result) = method_type; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2480 return unpack_method_and_appendix(mname, caller, appendix_box, appendix_result, THREAD); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2481 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2482 |
0 | 2483 // Since the identity hash code for symbols changes when the symbols are |
2484 // moved from the regular perm gen (hash in the mark word) to the shared | |
2485 // spaces (hash is the address), the classes loaded into the dictionary | |
2486 // may be in the wrong buckets. | |
2487 | |
2488 void SystemDictionary::reorder_dictionary() { | |
2489 dictionary()->reorder_dictionary(); | |
2490 } | |
2491 | |
2492 | |
2493 void SystemDictionary::copy_buckets(char** top, char* end) { | |
2494 dictionary()->copy_buckets(top, end); | |
2495 } | |
2496 | |
2497 | |
2498 void SystemDictionary::copy_table(char** top, char* end) { | |
2499 dictionary()->copy_table(top, end); | |
2500 } | |
2501 | |
2502 | |
2503 void SystemDictionary::reverse() { | |
2504 dictionary()->reverse(); | |
2505 } | |
2506 | |
2507 int SystemDictionary::number_of_classes() { | |
2508 return dictionary()->number_of_entries(); | |
2509 } | |
2510 | |
2511 | |
2512 // ---------------------------------------------------------------------------- | |
2513 #ifndef PRODUCT | |
2514 | |
2515 void SystemDictionary::print() { | |
2516 dictionary()->print(); | |
2517 | |
2518 // Placeholders | |
2519 GCMutexLocker mu(SystemDictionary_lock); | |
2520 placeholders()->print(); | |
2521 | |
2522 // loader constraints - print under SD_lock | |
2523 constraints()->print(); | |
2524 } | |
2525 | |
2526 #endif | |
2527 | |
2528 void SystemDictionary::verify() { | |
2529 guarantee(dictionary() != NULL, "Verify of system dictionary failed"); | |
2530 guarantee(constraints() != NULL, | |
2531 "Verify of loader constraints failed"); | |
2532 guarantee(dictionary()->number_of_entries() >= 0 && | |
2533 placeholders()->number_of_entries() >= 0, | |
2534 "Verify of system dictionary failed"); | |
2535 | |
2536 // Verify dictionary | |
2537 dictionary()->verify(); | |
2538 | |
2539 GCMutexLocker mu(SystemDictionary_lock); | |
2540 placeholders()->verify(); | |
2541 | |
2542 // Verify constraint table | |
2543 guarantee(constraints() != NULL, "Verify of loader constraints failed"); | |
1258
38836cf1d8d2
6920977: G1: guarantee(k == probe->klass(),"klass should be in dictionary") fails
tonyp
parents:
1142
diff
changeset
|
2544 constraints()->verify(dictionary(), placeholders()); |
0 | 2545 } |
2546 | |
2547 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2548 void SystemDictionary::verify_obj_klass_present(Symbol* class_name, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2549 ClassLoaderData* loader_data) { |
0 | 2550 GCMutexLocker mu(SystemDictionary_lock); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2551 Symbol* name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2552 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2553 Klass* probe = find_class(class_name, loader_data); |
0 | 2554 if (probe == NULL) { |
2555 probe = SystemDictionary::find_shared_class(class_name); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2556 if (probe == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2557 name = find_placeholder(class_name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2558 } |
0 | 2559 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2560 guarantee(probe != NULL || name != NULL, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2561 "Loaded klasses should be in SystemDictionary"); |
0 | 2562 } |
2563 | |
2564 #ifndef PRODUCT | |
2565 | |
2566 // statistics code | |
2567 class ClassStatistics: AllStatic { | |
2568 private: | |
2569 static int nclasses; // number of classes | |
2570 static int nmethods; // number of methods | |
2571 static int nmethoddata; // number of methodData | |
2572 static int class_size; // size of class objects in words | |
2573 static int method_size; // size of method objects in words | |
2574 static int debug_size; // size of debug info in methods | |
2575 static int methoddata_size; // size of methodData objects in words | |
2576 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2577 static void do_class(Klass* k) { |
0 | 2578 nclasses++; |
2579 class_size += k->size(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2580 if (k->oop_is_instance()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2581 InstanceKlass* ik = (InstanceKlass*)k; |
0 | 2582 class_size += ik->methods()->size(); |
2583 class_size += ik->constants()->size(); | |
2584 class_size += ik->local_interfaces()->size(); | |
2585 class_size += ik->transitive_interfaces()->size(); | |
2586 // We do not have to count implementors, since we only store one! | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2587 // SSS: How should these be accounted now that they have moved? |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2588 // class_size += ik->fields()->length(); |
0 | 2589 } |
2590 } | |
2591 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2592 static void do_method(Method* m) { |
0 | 2593 nmethods++; |
2594 method_size += m->size(); | |
2595 // class loader uses same objArray for empty vectors, so don't count these | |
2596 if (m->has_stackmap_table()) { | |
2597 method_size += m->stackmap_data()->size(); | |
2598 } | |
2599 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2600 MethodData* mdo = m->method_data(); |
0 | 2601 if (mdo != NULL) { |
2602 nmethoddata++; | |
2603 methoddata_size += mdo->size(); | |
2604 } | |
2605 } | |
2606 | |
2607 public: | |
2608 static void print() { | |
2609 SystemDictionary::classes_do(do_class); | |
2610 SystemDictionary::methods_do(do_method); | |
2611 tty->print_cr("Class statistics:"); | |
2612 tty->print_cr("%d classes (%d bytes)", nclasses, class_size * oopSize); | |
2613 tty->print_cr("%d methods (%d bytes = %d base + %d debug info)", nmethods, | |
2614 (method_size + debug_size) * oopSize, method_size * oopSize, debug_size * oopSize); | |
2615 tty->print_cr("%d methoddata (%d bytes)", nmethoddata, methoddata_size * oopSize); | |
2616 } | |
2617 }; | |
2618 | |
2619 | |
2620 int ClassStatistics::nclasses = 0; | |
2621 int ClassStatistics::nmethods = 0; | |
2622 int ClassStatistics::nmethoddata = 0; | |
2623 int ClassStatistics::class_size = 0; | |
2624 int ClassStatistics::method_size = 0; | |
2625 int ClassStatistics::debug_size = 0; | |
2626 int ClassStatistics::methoddata_size = 0; | |
2627 | |
2628 void SystemDictionary::print_class_statistics() { | |
2629 ResourceMark rm; | |
2630 ClassStatistics::print(); | |
2631 } | |
2632 | |
2633 | |
2634 class MethodStatistics: AllStatic { | |
2635 public: | |
2636 enum { | |
2637 max_parameter_size = 10 | |
2638 }; | |
2639 private: | |
2640 | |
2641 static int _number_of_methods; | |
2642 static int _number_of_final_methods; | |
2643 static int _number_of_static_methods; | |
2644 static int _number_of_native_methods; | |
2645 static int _number_of_synchronized_methods; | |
2646 static int _number_of_profiled_methods; | |
2647 static int _number_of_bytecodes; | |
2648 static int _parameter_size_profile[max_parameter_size]; | |
2649 static int _bytecodes_profile[Bytecodes::number_of_java_codes]; | |
2650 | |
2651 static void initialize() { | |
2652 _number_of_methods = 0; | |
2653 _number_of_final_methods = 0; | |
2654 _number_of_static_methods = 0; | |
2655 _number_of_native_methods = 0; | |
2656 _number_of_synchronized_methods = 0; | |
2657 _number_of_profiled_methods = 0; | |
2658 _number_of_bytecodes = 0; | |
2659 for (int i = 0; i < max_parameter_size ; i++) _parameter_size_profile[i] = 0; | |
2660 for (int j = 0; j < Bytecodes::number_of_java_codes; j++) _bytecodes_profile [j] = 0; | |
2661 }; | |
2662 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2663 static void do_method(Method* m) { |
0 | 2664 _number_of_methods++; |
2665 // collect flag info | |
2666 if (m->is_final() ) _number_of_final_methods++; | |
2667 if (m->is_static() ) _number_of_static_methods++; | |
2668 if (m->is_native() ) _number_of_native_methods++; | |
2669 if (m->is_synchronized()) _number_of_synchronized_methods++; | |
2670 if (m->method_data() != NULL) _number_of_profiled_methods++; | |
2671 // collect parameter size info (add one for receiver, if any) | |
2672 _parameter_size_profile[MIN2(m->size_of_parameters() + (m->is_static() ? 0 : 1), max_parameter_size - 1)]++; | |
2673 // collect bytecodes info | |
2674 { | |
2675 Thread *thread = Thread::current(); | |
2676 HandleMark hm(thread); | |
2677 BytecodeStream s(methodHandle(thread, m)); | |
2678 Bytecodes::Code c; | |
2679 while ((c = s.next()) >= 0) { | |
2680 _number_of_bytecodes++; | |
2681 _bytecodes_profile[c]++; | |
2682 } | |
2683 } | |
2684 } | |
2685 | |
2686 public: | |
2687 static void print() { | |
2688 initialize(); | |
2689 SystemDictionary::methods_do(do_method); | |
2690 // generate output | |
2691 tty->cr(); | |
2692 tty->print_cr("Method statistics (static):"); | |
2693 // flag distribution | |
2694 tty->cr(); | |
2695 tty->print_cr("%6d final methods %6.1f%%", _number_of_final_methods , _number_of_final_methods * 100.0F / _number_of_methods); | |
2696 tty->print_cr("%6d static methods %6.1f%%", _number_of_static_methods , _number_of_static_methods * 100.0F / _number_of_methods); | |
2697 tty->print_cr("%6d native methods %6.1f%%", _number_of_native_methods , _number_of_native_methods * 100.0F / _number_of_methods); | |
2698 tty->print_cr("%6d synchronized methods %6.1f%%", _number_of_synchronized_methods, _number_of_synchronized_methods * 100.0F / _number_of_methods); | |
2699 tty->print_cr("%6d profiled methods %6.1f%%", _number_of_profiled_methods, _number_of_profiled_methods * 100.0F / _number_of_methods); | |
2700 // parameter size profile | |
2701 tty->cr(); | |
2702 { int tot = 0; | |
2703 int avg = 0; | |
2704 for (int i = 0; i < max_parameter_size; i++) { | |
2705 int n = _parameter_size_profile[i]; | |
2706 tot += n; | |
2707 avg += n*i; | |
2708 tty->print_cr("parameter size = %1d: %6d methods %5.1f%%", i, n, n * 100.0F / _number_of_methods); | |
2709 } | |
2710 assert(tot == _number_of_methods, "should be the same"); | |
2711 tty->print_cr(" %6d methods 100.0%%", _number_of_methods); | |
2712 tty->print_cr("(average parameter size = %3.1f including receiver, if any)", (float)avg / _number_of_methods); | |
2713 } | |
2714 // bytecodes profile | |
2715 tty->cr(); | |
2716 { int tot = 0; | |
2717 for (int i = 0; i < Bytecodes::number_of_java_codes; i++) { | |
2718 if (Bytecodes::is_defined(i)) { | |
2719 Bytecodes::Code c = Bytecodes::cast(i); | |
2720 int n = _bytecodes_profile[c]; | |
2721 tot += n; | |
2722 tty->print_cr("%9d %7.3f%% %s", n, n * 100.0F / _number_of_bytecodes, Bytecodes::name(c)); | |
2723 } | |
2724 } | |
2725 assert(tot == _number_of_bytecodes, "should be the same"); | |
2726 tty->print_cr("%9d 100.000%%", _number_of_bytecodes); | |
2727 } | |
2728 tty->cr(); | |
2729 } | |
2730 }; | |
2731 | |
2732 int MethodStatistics::_number_of_methods; | |
2733 int MethodStatistics::_number_of_final_methods; | |
2734 int MethodStatistics::_number_of_static_methods; | |
2735 int MethodStatistics::_number_of_native_methods; | |
2736 int MethodStatistics::_number_of_synchronized_methods; | |
2737 int MethodStatistics::_number_of_profiled_methods; | |
2738 int MethodStatistics::_number_of_bytecodes; | |
2739 int MethodStatistics::_parameter_size_profile[MethodStatistics::max_parameter_size]; | |
2740 int MethodStatistics::_bytecodes_profile[Bytecodes::number_of_java_codes]; | |
2741 | |
2742 | |
2743 void SystemDictionary::print_method_statistics() { | |
2744 MethodStatistics::print(); | |
2745 } | |
2746 | |
2747 #endif // PRODUCT |