Mercurial > hg > truffle
annotate src/share/vm/oops/instanceKlass.cpp @ 7464:ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
Summary: Count number of instance classes so that it matches class metadata size
Reviewed-by: coleenp, acorn
| author | zgu |
|---|---|
| date | Tue, 08 Jan 2013 14:04:25 -0500 |
| parents | f34d701e952e |
| children | 37a3e8b7a1e9 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
5935
a735aec54ea4
7123170: JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02
sspitsyn
parents:
4739
diff
changeset
|
2 * Copyright (c) 1997, 2012, 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:
1490
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
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:
1490
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "classfile/javaClasses.hpp" | |
| 27 #include "classfile/systemDictionary.hpp" | |
| 28 #include "classfile/verifier.hpp" | |
| 29 #include "classfile/vmSymbols.hpp" | |
| 30 #include "compiler/compileBroker.hpp" | |
| 31 #include "gc_implementation/shared/markSweep.inline.hpp" | |
| 32 #include "gc_interface/collectedHeap.inline.hpp" | |
| 33 #include "interpreter/oopMapCache.hpp" | |
| 34 #include "interpreter/rewriter.hpp" | |
| 35 #include "jvmtifiles/jvmti.h" | |
| 36 #include "memory/genOopClosures.inline.hpp" | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
37 #include "memory/metadataFactory.hpp" |
| 1972 | 38 #include "memory/oopFactory.hpp" |
| 3938 | 39 #include "oops/fieldStreams.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
40 #include "oops/instanceClassLoaderKlass.hpp" |
| 1972 | 41 #include "oops/instanceKlass.hpp" |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
42 #include "oops/instanceMirrorKlass.hpp" |
| 1972 | 43 #include "oops/instanceOop.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
44 #include "oops/klass.inline.hpp" |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
45 #include "oops/method.hpp" |
| 1972 | 46 #include "oops/oop.inline.hpp" |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
47 #include "oops/symbol.hpp" |
| 1972 | 48 #include "prims/jvmtiExport.hpp" |
| 49 #include "prims/jvmtiRedefineClassesTrace.hpp" | |
| 50 #include "runtime/fieldDescriptor.hpp" | |
| 51 #include "runtime/handles.inline.hpp" | |
| 52 #include "runtime/javaCalls.hpp" | |
| 53 #include "runtime/mutexLocker.hpp" | |
|
7180
f34d701e952e
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
6985
diff
changeset
|
54 #include "runtime/thread.inline.hpp" |
| 1972 | 55 #include "services/threadService.hpp" |
| 56 #include "utilities/dtrace.hpp" | |
| 57 #ifndef SERIALGC | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
58 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp" |
| 1972 | 59 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" |
| 60 #include "gc_implementation/g1/g1OopClosures.inline.hpp" | |
| 61 #include "gc_implementation/g1/g1RemSet.inline.hpp" | |
| 62 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" | |
| 63 #include "gc_implementation/parNew/parOopClosures.inline.hpp" | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
64 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" |
| 1972 | 65 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" |
| 66 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" | |
| 67 #include "oops/oop.pcgc.inline.hpp" | |
| 68 #endif | |
| 69 #ifdef COMPILER1 | |
| 70 #include "c1/c1_Compiler.hpp" | |
| 71 #endif | |
| 0 | 72 |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
73 #ifdef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
74 |
| 4006 | 75 #ifndef USDT2 |
| 76 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
77 HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
78 char*, intptr_t, oop, intptr_t); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
79 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__recursive, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
80 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
81 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__concurrent, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
82 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
83 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__erroneous, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
84 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
85 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__super__failed, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
86 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
87 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__clinit, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
88 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
89 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__error, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
90 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
91 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
92 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
93 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
94 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
95 { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
96 char* data = NULL; \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
97 int len = 0; \ |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
98 Symbol* name = (clss)->name(); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
99 if (name != NULL) { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
100 data = (char*)name->bytes(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
101 len = name->utf8_length(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
102 } \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
103 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
104 data, len, (clss)->class_loader(), thread_type); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
105 } |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
106 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
107 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
108 { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
109 char* data = NULL; \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
110 int len = 0; \ |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
111 Symbol* name = (clss)->name(); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
112 if (name != NULL) { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
113 data = (char*)name->bytes(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
114 len = name->utf8_length(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
115 } \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
116 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
117 data, len, (clss)->class_loader(), thread_type, wait); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
118 } |
| 4006 | 119 #else /* USDT2 */ |
| 120 | |
| 121 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED | |
| 122 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE | |
| 123 #define HOTSPOT_CLASS_INITIALIZATION_concurrent HOTSPOT_CLASS_INITIALIZATION_CONCURRENT | |
| 124 #define HOTSPOT_CLASS_INITIALIZATION_erroneous HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS | |
| 125 #define HOTSPOT_CLASS_INITIALIZATION_super__failed HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED | |
| 126 #define HOTSPOT_CLASS_INITIALIZATION_clinit HOTSPOT_CLASS_INITIALIZATION_CLINIT | |
| 127 #define HOTSPOT_CLASS_INITIALIZATION_error HOTSPOT_CLASS_INITIALIZATION_ERROR | |
| 128 #define HOTSPOT_CLASS_INITIALIZATION_end HOTSPOT_CLASS_INITIALIZATION_END | |
| 129 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ | |
| 130 { \ | |
| 131 char* data = NULL; \ | |
| 132 int len = 0; \ | |
| 133 Symbol* name = (clss)->name(); \ | |
| 134 if (name != NULL) { \ | |
| 135 data = (char*)name->bytes(); \ | |
| 136 len = name->utf8_length(); \ | |
| 137 } \ | |
| 138 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 139 data, len, (clss)->class_loader(), thread_type); \ | |
| 140 } | |
| 141 | |
| 142 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ | |
| 143 { \ | |
| 144 char* data = NULL; \ | |
| 145 int len = 0; \ | |
| 146 Symbol* name = (clss)->name(); \ | |
| 147 if (name != NULL) { \ | |
| 148 data = (char*)name->bytes(); \ | |
| 149 len = name->utf8_length(); \ | |
| 150 } \ | |
| 151 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 152 data, len, (clss)->class_loader(), thread_type, wait); \ | |
| 153 } | |
| 154 #endif /* USDT2 */ | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
155 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
156 #else // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
157 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
158 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
159 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
160 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
161 #endif // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
162 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
163 volatile int InstanceKlass::_total_instanceKlass_count = 0; |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
164 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
165 Klass* InstanceKlass::allocate_instance_klass(ClassLoaderData* loader_data, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
166 int vtable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
167 int itable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
168 int static_field_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
169 int nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
170 ReferenceType rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
171 AccessFlags access_flags, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
172 Symbol* name, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
173 Klass* super_klass, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
174 KlassHandle host_klass, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
175 TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
176 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
177 int size = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
178 access_flags.is_interface(), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
179 !host_klass.is_null()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
180 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
181 // Allocation |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
182 InstanceKlass* ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
183 if (rt == REF_NONE) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
184 if (name == vmSymbols::java_lang_Class()) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
185 ik = new (loader_data, size, THREAD) InstanceMirrorKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
186 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
187 access_flags, !host_klass.is_null()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
188 } else if (name == vmSymbols::java_lang_ClassLoader() || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
189 (SystemDictionary::ClassLoader_klass_loaded() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
190 super_klass != NULL && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
191 super_klass->is_subtype_of(SystemDictionary::ClassLoader_klass()))) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
192 ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
193 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
194 access_flags, !host_klass.is_null()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
195 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
196 // normal class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
197 ik = new (loader_data, size, THREAD) InstanceKlass( |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
198 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
199 access_flags, !host_klass.is_null()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
200 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
201 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
202 // reference klass |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
203 ik = new (loader_data, size, THREAD) InstanceRefKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
204 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
205 access_flags, !host_klass.is_null()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
206 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
207 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
208 Atomic::inc(&_total_instanceKlass_count); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
209 return ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
210 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
211 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
212 InstanceKlass::InstanceKlass(int vtable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
213 int itable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
214 int static_field_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
215 int nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
216 ReferenceType rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
217 AccessFlags access_flags, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
218 bool is_anonymous) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
219 No_Safepoint_Verifier no_safepoint; // until k becomes parsable |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
220 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
221 int size = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
222 access_flags.is_interface(), is_anonymous); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
223 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
224 // The sizes of these these three variables are used for determining the |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
225 // size of the instanceKlassOop. It is critical that these are set to the right |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
226 // sizes before the first GC, i.e., when we allocate the mirror. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
227 this->set_vtable_length(vtable_len); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
228 this->set_itable_length(itable_len); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
229 this->set_static_field_size(static_field_size); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
230 this->set_nonstatic_oop_map_size(nonstatic_oop_map_size); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
231 this->set_access_flags(access_flags); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
232 this->set_is_anonymous(is_anonymous); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
233 assert(this->size() == size, "wrong size for object"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
234 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
235 this->set_array_klasses(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
236 this->set_methods(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
237 this->set_method_ordering(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
238 this->set_local_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
239 this->set_transitive_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
240 this->init_implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
241 this->set_fields(NULL, 0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
242 this->set_constants(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
243 this->set_class_loader_data(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
244 this->set_protection_domain(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
245 this->set_signers(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
246 this->set_source_file_name(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
247 this->set_source_debug_extension(NULL, 0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
248 this->set_array_name(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
249 this->set_inner_classes(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
250 this->set_static_oop_field_count(0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
251 this->set_nonstatic_field_size(0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
252 this->set_is_marked_dependent(false); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
253 this->set_init_state(InstanceKlass::allocated); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
254 this->set_init_thread(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
255 this->set_init_lock(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
256 this->set_reference_type(rt); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
257 this->set_oop_map_cache(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
258 this->set_jni_ids(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
259 this->set_osr_nmethods_head(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
260 this->set_breakpoints(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
261 this->init_previous_versions(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
262 this->set_generic_signature(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
263 this->release_set_methods_jmethod_ids(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
264 this->release_set_methods_cached_itable_indices(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
265 this->set_annotations(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
266 this->set_jvmti_cached_class_field_map(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
267 this->set_initial_method_idnum(0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
268 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
269 // initialize the non-header words to zero |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
270 intptr_t* p = (intptr_t*)this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
271 for (int index = InstanceKlass::header_size(); index < size; index++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
272 p[index] = NULL_WORD; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
273 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
274 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
275 // Set temporary value until parseClassFile updates it with the real instance |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
276 // size. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
277 this->set_layout_helper(Klass::instance_layout_helper(0, true)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
278 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
279 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
280 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
281 // This function deallocates the metadata and C heap pointers that the |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
282 // InstanceKlass points to. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
283 void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
284 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
285 // Orphan the mirror first, CMS thinks it's still live. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
286 java_lang_Class::set_klass(java_mirror(), NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
287 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
288 // Need to take this class off the class loader data list. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
289 loader_data->remove_class(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
290 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
291 // The array_klass for this class is created later, after error handling. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
292 // For class redefinition, we keep the original class so this scratch class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
293 // doesn't have an array class. Either way, assert that there is nothing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
294 // to deallocate. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
295 assert(array_klasses() == NULL, "array classes shouldn't be created for this class yet"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
296 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
297 // Release C heap allocated data that this might point to, which includes |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
298 // reference counting symbol names. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
299 release_C_heap_structures(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
300 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
301 Array<Method*>* ms = methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
302 if (ms != Universe::the_empty_method_array()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
303 for (int i = 0; i <= methods()->length() -1 ; i++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
304 Method* method = methods()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
305 // Only want to delete methods that are not executing for RedefineClasses. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
306 // The previous version will point to them so they're not totally dangling |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
307 assert (!method->on_stack(), "shouldn't be called with methods on stack"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
308 MetadataFactory::free_metadata(loader_data, method); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
309 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
310 MetadataFactory::free_array<Method*>(loader_data, methods()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
311 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
312 set_methods(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
313 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
314 if (method_ordering() != Universe::the_empty_int_array()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
315 MetadataFactory::free_array<int>(loader_data, method_ordering()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
316 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
317 set_method_ordering(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
318 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
319 // This array is in Klass, but remove it with the InstanceKlass since |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
320 // this place would be the only caller and it can share memory with transitive |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
321 // interfaces. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
322 if (secondary_supers() != Universe::the_empty_klass_array() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
323 secondary_supers() != transitive_interfaces()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
324 MetadataFactory::free_array<Klass*>(loader_data, secondary_supers()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
325 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
326 set_secondary_supers(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
327 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
328 // Only deallocate transitive interfaces if not empty, same as super class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
329 // or same as local interfaces. See code in parseClassFile. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
330 Array<Klass*>* ti = transitive_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
331 if (ti != Universe::the_empty_klass_array() && ti != local_interfaces()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
332 // check that the interfaces don't come from super class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
333 Array<Klass*>* sti = (super() == NULL) ? NULL : |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
334 InstanceKlass::cast(super())->transitive_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
335 if (ti != sti) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
336 MetadataFactory::free_array<Klass*>(loader_data, ti); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
337 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
338 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
339 set_transitive_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
340 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
341 // local interfaces can be empty |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
342 Array<Klass*>* li = local_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
343 if (li != Universe::the_empty_klass_array()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
344 MetadataFactory::free_array<Klass*>(loader_data, li); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
345 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
346 set_local_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
347 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
348 MetadataFactory::free_array<jushort>(loader_data, fields()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
349 set_fields(NULL, 0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
350 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
351 // If a method from a redefined class is using this constant pool, don't |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
352 // delete it, yet. The new class's previous version will point to this. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
353 assert (!constants()->on_stack(), "shouldn't be called if anything is onstack"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
354 MetadataFactory::free_metadata(loader_data, constants()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
355 set_constants(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
356 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
357 if (inner_classes() != Universe::the_empty_short_array()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
358 MetadataFactory::free_array<jushort>(loader_data, inner_classes()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
359 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
360 set_inner_classes(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
361 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
362 // Null out Java heap objects, although these won't be walked to keep |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
363 // alive once this InstanceKlass is deallocated. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
364 set_protection_domain(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
365 set_signers(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
366 set_init_lock(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
367 set_annotations(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
368 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
369 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
370 volatile oop InstanceKlass::init_lock() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
371 volatile oop lock = _init_lock; // read once |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
372 assert((oop)lock != NULL || !is_not_initialized(), // initialized or in_error state |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
373 "only fully initialized state can have a null lock"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
374 return lock; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
375 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
376 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
377 // Set the initialization lock to null so the object can be GC'ed. Any racing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
378 // threads to get this lock will see a null lock and will not lock. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
379 // That's okay because they all check for initialized state after getting |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
380 // the lock and return. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
381 void InstanceKlass::fence_and_clear_init_lock() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
382 // make sure previous stores are all done, notably the init_state. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
383 OrderAccess::storestore(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
384 klass_oop_store(&_init_lock, NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
385 assert(!is_not_initialized(), "class must be initialized now"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
386 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
387 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
388 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
389 bool InstanceKlass::should_be_initialized() const { |
| 0 | 390 return !is_initialized(); |
| 391 } | |
| 392 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
393 klassVtable* InstanceKlass::vtable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
394 return new klassVtable(this, start_of_vtable(), vtable_length() / vtableEntry::size()); |
| 0 | 395 } |
| 396 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
397 klassItable* InstanceKlass::itable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
398 return new klassItable(instanceKlassHandle(this)); |
| 0 | 399 } |
| 400 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
401 void InstanceKlass::eager_initialize(Thread *thread) { |
| 0 | 402 if (!EagerInitialization) return; |
| 403 | |
| 404 if (this->is_not_initialized()) { | |
| 405 // abort if the the class has a class initializer | |
| 406 if (this->class_initializer() != NULL) return; | |
| 407 | |
| 408 // abort if it is java.lang.Object (initialization is handled in genesis) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
409 Klass* super = this->super(); |
| 0 | 410 if (super == NULL) return; |
| 411 | |
| 412 // abort if the super class should be initialized | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
413 if (!InstanceKlass::cast(super)->is_initialized()) return; |
| 0 | 414 |
| 415 // call body to expose the this pointer | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
416 instanceKlassHandle this_oop(thread, this); |
| 0 | 417 eager_initialize_impl(this_oop); |
| 418 } | |
| 419 } | |
| 420 | |
| 421 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
422 void InstanceKlass::eager_initialize_impl(instanceKlassHandle this_oop) { |
| 0 | 423 EXCEPTION_MARK; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
424 volatile oop init_lock = this_oop->init_lock(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
425 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 426 |
| 427 // abort if someone beat us to the initialization | |
| 428 if (!this_oop->is_not_initialized()) return; // note: not equivalent to is_initialized() | |
| 429 | |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
430 ClassState old_state = this_oop->init_state(); |
| 0 | 431 link_class_impl(this_oop, true, THREAD); |
| 432 if (HAS_PENDING_EXCEPTION) { | |
| 433 CLEAR_PENDING_EXCEPTION; | |
| 434 // Abort if linking the class throws an exception. | |
| 435 | |
| 436 // Use a test to avoid redundantly resetting the state if there's | |
| 437 // no change. Set_init_state() asserts that state changes make | |
| 438 // progress, whereas here we might just be spinning in place. | |
| 439 if( old_state != this_oop->_init_state ) | |
| 440 this_oop->set_init_state (old_state); | |
| 441 } else { | |
| 442 // linking successfull, mark class as initialized | |
| 443 this_oop->set_init_state (fully_initialized); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
444 this_oop->fence_and_clear_init_lock(); |
| 0 | 445 // trace |
| 446 if (TraceClassInitialization) { | |
| 447 ResourceMark rm(THREAD); | |
| 448 tty->print_cr("[Initialized %s without side effects]", this_oop->external_name()); | |
| 449 } | |
| 450 } | |
| 451 } | |
| 452 | |
| 453 | |
| 454 // See "The Virtual Machine Specification" section 2.16.5 for a detailed explanation of the class initialization | |
| 455 // process. The step comments refers to the procedure described in that section. | |
| 456 // Note: implementation moved to static method to expose the this pointer. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
457 void InstanceKlass::initialize(TRAPS) { |
| 0 | 458 if (this->should_be_initialized()) { |
| 459 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
460 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 461 initialize_impl(this_oop, CHECK); |
| 462 // Note: at this point the class may be initialized | |
| 463 // OR it may be in the state of being initialized | |
| 464 // in case of recursive initialization! | |
| 465 } else { | |
| 466 assert(is_initialized(), "sanity check"); | |
| 467 } | |
| 468 } | |
| 469 | |
| 470 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
471 bool InstanceKlass::verify_code( |
| 0 | 472 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 473 // 1) Verify the bytecodes | |
| 474 Verifier::Mode mode = | |
| 475 throw_verifyerror ? Verifier::ThrowException : Verifier::NoException; | |
|
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
964
diff
changeset
|
476 return Verifier::verify(this_oop, mode, this_oop->should_verify_class(), CHECK_false); |
| 0 | 477 } |
| 478 | |
| 479 | |
| 480 // Used exclusively by the shared spaces dump mechanism to prevent | |
| 481 // classes mapped into the shared regions in new VMs from appearing linked. | |
| 482 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
483 void InstanceKlass::unlink_class() { |
| 0 | 484 assert(is_linked(), "must be linked"); |
| 485 _init_state = loaded; | |
| 486 } | |
| 487 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
488 void InstanceKlass::link_class(TRAPS) { |
| 0 | 489 assert(is_loaded(), "must be loaded"); |
| 490 if (!is_linked()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
491 HandleMark hm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
492 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 493 link_class_impl(this_oop, true, CHECK); |
| 494 } | |
| 495 } | |
| 496 | |
| 497 // Called to verify that a class can link during initialization, without | |
| 498 // throwing a VerifyError. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
499 bool InstanceKlass::link_class_or_fail(TRAPS) { |
| 0 | 500 assert(is_loaded(), "must be loaded"); |
| 501 if (!is_linked()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
502 HandleMark hm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
503 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 504 link_class_impl(this_oop, false, CHECK_false); |
| 505 } | |
| 506 return is_linked(); | |
| 507 } | |
| 508 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
509 bool InstanceKlass::link_class_impl( |
| 0 | 510 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 511 // check for error state | |
| 512 if (this_oop->is_in_error_state()) { | |
| 513 ResourceMark rm(THREAD); | |
| 514 THROW_MSG_(vmSymbols::java_lang_NoClassDefFoundError(), | |
| 515 this_oop->external_name(), false); | |
| 516 } | |
| 517 // return if already verified | |
| 518 if (this_oop->is_linked()) { | |
| 519 return true; | |
| 520 } | |
| 521 | |
| 522 // Timing | |
| 523 // timer handles recursion | |
| 524 assert(THREAD->is_Java_thread(), "non-JavaThread in link_class_impl"); | |
| 525 JavaThread* jt = (JavaThread*)THREAD; | |
| 526 | |
| 527 // link super class before linking this class | |
| 528 instanceKlassHandle super(THREAD, this_oop->super()); | |
| 529 if (super.not_null()) { | |
| 530 if (super->is_interface()) { // check if super class is an interface | |
| 531 ResourceMark rm(THREAD); | |
| 532 Exceptions::fthrow( | |
| 533 THREAD_AND_LOCATION, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
534 vmSymbols::java_lang_IncompatibleClassChangeError(), |
| 0 | 535 "class %s has interface %s as super class", |
| 536 this_oop->external_name(), | |
| 537 super->external_name() | |
| 538 ); | |
| 539 return false; | |
| 540 } | |
| 541 | |
| 542 link_class_impl(super, throw_verifyerror, CHECK_false); | |
| 543 } | |
| 544 | |
| 545 // link all interfaces implemented by this class before linking this class | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
546 Array<Klass*>* interfaces = this_oop->local_interfaces(); |
| 0 | 547 int num_interfaces = interfaces->length(); |
| 548 for (int index = 0; index < num_interfaces; index++) { | |
| 549 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
550 instanceKlassHandle ih(THREAD, interfaces->at(index)); |
| 0 | 551 link_class_impl(ih, throw_verifyerror, CHECK_false); |
| 552 } | |
| 553 | |
| 554 // in case the class is linked in the process of linking its superclasses | |
| 555 if (this_oop->is_linked()) { | |
| 556 return true; | |
| 557 } | |
| 558 | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
559 // trace only the link time for this klass that includes |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
560 // the verification time |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
561 PerfClassTraceTime vmtimer(ClassLoader::perf_class_link_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
562 ClassLoader::perf_class_link_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
563 ClassLoader::perf_classes_linked(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
564 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
565 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
566 PerfClassTraceTime::CLASS_LINK); |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
567 |
| 0 | 568 // verification & rewriting |
| 569 { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
570 volatile oop init_lock = this_oop->init_lock(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
571 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 572 // rewritten will have been set if loader constraint error found |
| 573 // on an earlier link attempt | |
| 574 // don't verify or rewrite if already rewritten | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
575 |
| 0 | 576 if (!this_oop->is_linked()) { |
| 577 if (!this_oop->is_rewritten()) { | |
| 578 { | |
| 579 // Timer includes any side effects of class verification (resolution, | |
| 580 // etc), but not recursive entry into verify_code(). | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
581 PerfClassTraceTime timer(ClassLoader::perf_class_verify_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
582 ClassLoader::perf_class_verify_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
583 ClassLoader::perf_classes_verified(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
584 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
585 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
586 PerfClassTraceTime::CLASS_VERIFY); |
| 0 | 587 bool verify_ok = verify_code(this_oop, throw_verifyerror, THREAD); |
| 588 if (!verify_ok) { | |
| 589 return false; | |
| 590 } | |
| 591 } | |
| 592 | |
| 593 // Just in case a side-effect of verify linked this class already | |
| 594 // (which can sometimes happen since the verifier loads classes | |
| 595 // using custom class loaders, which are free to initialize things) | |
| 596 if (this_oop->is_linked()) { | |
| 597 return true; | |
| 598 } | |
| 599 | |
| 600 // also sets rewritten | |
| 601 this_oop->rewrite_class(CHECK_false); | |
| 602 } | |
| 603 | |
| 3748 | 604 // relocate jsrs and link methods after they are all rewritten |
| 605 this_oop->relocate_and_link_methods(CHECK_false); | |
| 606 | |
| 0 | 607 // Initialize the vtable and interface table after |
| 608 // methods have been rewritten since rewrite may | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
609 // fabricate new Method*s. |
| 0 | 610 // also does loader constraint checking |
| 611 if (!this_oop()->is_shared()) { | |
| 612 ResourceMark rm(THREAD); | |
| 613 this_oop->vtable()->initialize_vtable(true, CHECK_false); | |
| 614 this_oop->itable()->initialize_itable(true, CHECK_false); | |
| 615 } | |
| 616 #ifdef ASSERT | |
| 617 else { | |
| 618 ResourceMark rm(THREAD); | |
| 619 this_oop->vtable()->verify(tty, true); | |
| 620 // In case itable verification is ever added. | |
| 621 // this_oop->itable()->verify(tty, true); | |
| 622 } | |
| 623 #endif | |
| 624 this_oop->set_init_state(linked); | |
| 625 if (JvmtiExport::should_post_class_prepare()) { | |
| 626 Thread *thread = THREAD; | |
| 627 assert(thread->is_Java_thread(), "thread->is_Java_thread()"); | |
| 628 JvmtiExport::post_class_prepare((JavaThread *) thread, this_oop()); | |
| 629 } | |
| 630 } | |
| 631 } | |
| 632 return true; | |
| 633 } | |
| 634 | |
| 635 | |
| 636 // Rewrite the byte codes of all of the methods of a class. | |
| 637 // The rewriter must be called exactly once. Rewriting must happen after | |
| 638 // verification but before the first method of the class is executed. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
639 void InstanceKlass::rewrite_class(TRAPS) { |
| 0 | 640 assert(is_loaded(), "must be loaded"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
641 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 642 if (this_oop->is_rewritten()) { |
| 643 assert(this_oop()->is_shared(), "rewriting an unshared class?"); | |
| 644 return; | |
| 645 } | |
| 3748 | 646 Rewriter::rewrite(this_oop, CHECK); |
| 0 | 647 this_oop->set_rewritten(); |
| 648 } | |
| 649 | |
| 3748 | 650 // Now relocate and link method entry points after class is rewritten. |
| 651 // This is outside is_rewritten flag. In case of an exception, it can be | |
| 652 // executed more than once. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
653 void InstanceKlass::relocate_and_link_methods(TRAPS) { |
| 3748 | 654 assert(is_loaded(), "must be loaded"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
655 instanceKlassHandle this_oop(THREAD, this); |
| 3748 | 656 Rewriter::relocate_and_link(this_oop, CHECK); |
| 657 } | |
| 658 | |
| 0 | 659 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
660 void InstanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) { |
| 0 | 661 // Make sure klass is linked (verified) before initialization |
| 662 // A class could already be verified, since it has been reflected upon. | |
| 663 this_oop->link_class(CHECK); | |
| 664 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
665 DTRACE_CLASSINIT_PROBE(required, InstanceKlass::cast(this_oop()), -1); |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
666 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
667 bool wait = false; |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
668 |
| 0 | 669 // refer to the JVM book page 47 for description of steps |
| 670 // Step 1 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
671 { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
672 volatile oop init_lock = this_oop->init_lock(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
673 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 674 |
| 675 Thread *self = THREAD; // it's passed the current thread | |
| 676 | |
| 677 // Step 2 | |
| 678 // If we were to use wait() instead of waitInterruptibly() then | |
| 679 // we might end up throwing IE from link/symbol resolution sites | |
| 680 // that aren't expected to throw. This would wreak havoc. See 6320309. | |
| 681 while(this_oop->is_being_initialized() && !this_oop->is_reentrant_initialization(self)) { | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
682 wait = true; |
| 0 | 683 ol.waitUninterruptibly(CHECK); |
| 684 } | |
| 685 | |
| 686 // Step 3 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
687 if (this_oop->is_being_initialized() && this_oop->is_reentrant_initialization(self)) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
688 DTRACE_CLASSINIT_PROBE_WAIT(recursive, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 689 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
690 } |
| 0 | 691 |
| 692 // Step 4 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
693 if (this_oop->is_initialized()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
694 DTRACE_CLASSINIT_PROBE_WAIT(concurrent, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 695 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
696 } |
| 0 | 697 |
| 698 // Step 5 | |
| 699 if (this_oop->is_in_error_state()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
700 DTRACE_CLASSINIT_PROBE_WAIT(erroneous, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 701 ResourceMark rm(THREAD); |
| 702 const char* desc = "Could not initialize class "; | |
| 703 const char* className = this_oop->external_name(); | |
| 704 size_t msglen = strlen(desc) + strlen(className) + 1; | |
|
1751
2528b5bd749c
6980262: Memory leak when exception is thrown in static initializer
kamg
parents:
1706
diff
changeset
|
705 char* message = NEW_RESOURCE_ARRAY(char, msglen); |
| 0 | 706 if (NULL == message) { |
| 707 // Out of memory: can't create detailed error message | |
| 708 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), className); | |
| 709 } else { | |
| 710 jio_snprintf(message, msglen, "%s%s", desc, className); | |
| 711 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), message); | |
| 712 } | |
| 713 } | |
| 714 | |
| 715 // Step 6 | |
| 716 this_oop->set_init_state(being_initialized); | |
| 717 this_oop->set_init_thread(self); | |
| 718 } | |
| 719 | |
| 720 // Step 7 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
721 Klass* super_klass = this_oop->super(); |
| 6983 | 722 if (super_klass != NULL && !this_oop->is_interface() && super_klass->should_be_initialized()) { |
| 723 super_klass->initialize(THREAD); | |
| 0 | 724 |
| 725 if (HAS_PENDING_EXCEPTION) { | |
| 726 Handle e(THREAD, PENDING_EXCEPTION); | |
| 727 CLEAR_PENDING_EXCEPTION; | |
| 728 { | |
| 729 EXCEPTION_MARK; | |
| 730 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); // Locks object, set state, and notify all waiting threads | |
| 731 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, superclass initialization error is thrown below | |
| 732 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
733 DTRACE_CLASSINIT_PROBE_WAIT(super__failed, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 734 THROW_OOP(e()); |
| 735 } | |
| 736 } | |
| 737 | |
| 6934 | 738 if (this_oop->has_default_methods()) { |
| 739 // Step 7.5: initialize any interfaces which have default methods | |
| 740 for (int i = 0; i < this_oop->local_interfaces()->length(); ++i) { | |
| 741 Klass* iface = this_oop->local_interfaces()->at(i); | |
| 742 InstanceKlass* ik = InstanceKlass::cast(iface); | |
| 743 if (ik->has_default_methods() && ik->should_be_initialized()) { | |
| 744 ik->initialize(THREAD); | |
| 745 | |
| 746 if (HAS_PENDING_EXCEPTION) { | |
| 747 Handle e(THREAD, PENDING_EXCEPTION); | |
| 748 CLEAR_PENDING_EXCEPTION; | |
| 749 { | |
| 750 EXCEPTION_MARK; | |
| 751 // Locks object, set state, and notify all waiting threads | |
| 752 this_oop->set_initialization_state_and_notify( | |
| 753 initialization_error, THREAD); | |
| 754 | |
| 755 // ignore any exception thrown, superclass initialization error is | |
| 756 // thrown below | |
| 757 CLEAR_PENDING_EXCEPTION; | |
| 758 } | |
| 759 DTRACE_CLASSINIT_PROBE_WAIT( | |
| 760 super__failed, InstanceKlass::cast(this_oop()), -1, wait); | |
| 761 THROW_OOP(e()); | |
| 762 } | |
| 763 } | |
| 764 } | |
| 765 } | |
| 766 | |
| 0 | 767 // Step 8 |
| 768 { | |
| 769 assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl"); | |
| 770 JavaThread* jt = (JavaThread*)THREAD; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
771 DTRACE_CLASSINIT_PROBE_WAIT(clinit, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 772 // Timer includes any side effects of class initialization (resolution, |
| 773 // etc), but not recursive entry into call_class_initializer(). | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
774 PerfClassTraceTime timer(ClassLoader::perf_class_init_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
775 ClassLoader::perf_class_init_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
776 ClassLoader::perf_classes_inited(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
777 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
778 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
779 PerfClassTraceTime::CLASS_CLINIT); |
| 0 | 780 this_oop->call_class_initializer(THREAD); |
| 781 } | |
| 782 | |
| 783 // Step 9 | |
| 784 if (!HAS_PENDING_EXCEPTION) { | |
| 785 this_oop->set_initialization_state_and_notify(fully_initialized, CHECK); | |
| 786 { ResourceMark rm(THREAD); | |
| 787 debug_only(this_oop->vtable()->verify(tty, true);) | |
| 788 } | |
| 789 } | |
| 790 else { | |
| 791 // Step 10 and 11 | |
| 792 Handle e(THREAD, PENDING_EXCEPTION); | |
| 793 CLEAR_PENDING_EXCEPTION; | |
| 794 { | |
| 795 EXCEPTION_MARK; | |
| 796 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); | |
| 797 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, class initialization error is thrown below | |
| 798 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
799 DTRACE_CLASSINIT_PROBE_WAIT(error, InstanceKlass::cast(this_oop()), -1,wait); |
| 1142 | 800 if (e->is_a(SystemDictionary::Error_klass())) { |
| 0 | 801 THROW_OOP(e()); |
| 802 } else { | |
| 803 JavaCallArguments args(e); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
804 THROW_ARG(vmSymbols::java_lang_ExceptionInInitializerError(), |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
805 vmSymbols::throwable_void_signature(), |
| 0 | 806 &args); |
| 807 } | |
| 808 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
809 DTRACE_CLASSINIT_PROBE_WAIT(end, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 810 } |
| 811 | |
| 812 | |
| 813 // Note: implementation moved to static method to expose the this pointer. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
814 void InstanceKlass::set_initialization_state_and_notify(ClassState state, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
815 instanceKlassHandle kh(THREAD, this); |
| 0 | 816 set_initialization_state_and_notify_impl(kh, state, CHECK); |
| 817 } | |
| 818 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
819 void InstanceKlass::set_initialization_state_and_notify_impl(instanceKlassHandle this_oop, ClassState state, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
820 volatile oop init_lock = this_oop->init_lock(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
821 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 822 this_oop->set_init_state(state); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
823 this_oop->fence_and_clear_init_lock(); |
| 0 | 824 ol.notify_all(CHECK); |
| 825 } | |
| 826 | |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
827 // The embedded _implementor field can only record one implementor. |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
828 // When there are more than one implementors, the _implementor field |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
829 // is set to the interface Klass* itself. Following are the possible |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
830 // values for the _implementor field: |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
831 // NULL - no implementor |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
832 // implementor Klass* - one implementor |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
833 // self - more than one implementor |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
834 // |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
835 // The _implementor field only exists for interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
836 void InstanceKlass::add_implementor(Klass* k) { |
| 0 | 837 assert(Compile_lock->owned_by_self(), ""); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
838 assert(is_interface(), "not interface"); |
| 0 | 839 // Filter out my subinterfaces. |
| 840 // (Note: Interfaces are never on the subklass list.) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
841 if (InstanceKlass::cast(k)->is_interface()) return; |
| 0 | 842 |
| 843 // Filter out subclasses whose supers already implement me. | |
| 844 // (Note: CHA must walk subclasses of direct implementors | |
| 845 // in order to locate indirect implementors.) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
846 Klass* sk = InstanceKlass::cast(k)->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
847 if (sk != NULL && InstanceKlass::cast(sk)->implements_interface(this)) |
| 0 | 848 // We only need to check one immediate superclass, since the |
| 849 // implements_interface query looks at transitive_interfaces. | |
| 850 // Any supers of the super have the same (or fewer) transitive_interfaces. | |
| 851 return; | |
| 852 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
853 Klass* ik = implementor(); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
854 if (ik == NULL) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
855 set_implementor(k); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
856 } else if (ik != this) { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
857 // There is already an implementor. Use itself as an indicator of |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
858 // more than one implementors. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
859 set_implementor(this); |
| 0 | 860 } |
| 861 | |
| 862 // The implementor also implements the transitive_interfaces | |
| 863 for (int index = 0; index < local_interfaces()->length(); index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
864 InstanceKlass::cast(local_interfaces()->at(index))->add_implementor(k); |
| 0 | 865 } |
| 866 } | |
| 867 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
868 void InstanceKlass::init_implementor() { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
869 if (is_interface()) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
870 set_implementor(NULL); |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
871 } |
| 0 | 872 } |
| 873 | |
| 874 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
875 void InstanceKlass::process_interfaces(Thread *thread) { |
| 0 | 876 // link this class into the implementors list of every interface it implements |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
877 Klass* this_as_klass_oop = this; |
| 0 | 878 for (int i = local_interfaces()->length() - 1; i >= 0; i--) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
879 assert(local_interfaces()->at(i)->is_klass(), "must be a klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
880 InstanceKlass* interf = InstanceKlass::cast(local_interfaces()->at(i)); |
| 0 | 881 assert(interf->is_interface(), "expected interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
882 interf->add_implementor(this_as_klass_oop); |
| 0 | 883 } |
| 884 } | |
| 885 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
886 bool InstanceKlass::can_be_primary_super_slow() const { |
| 0 | 887 if (is_interface()) |
| 888 return false; | |
| 889 else | |
| 890 return Klass::can_be_primary_super_slow(); | |
| 891 } | |
| 892 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
893 GrowableArray<Klass*>* InstanceKlass::compute_secondary_supers(int num_extra_slots) { |
| 0 | 894 // The secondaries are the implemented interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
895 InstanceKlass* ik = InstanceKlass::cast(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
896 Array<Klass*>* interfaces = ik->transitive_interfaces(); |
| 0 | 897 int num_secondaries = num_extra_slots + interfaces->length(); |
| 898 if (num_secondaries == 0) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
899 // Must share this for correct bootstrapping! |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
900 set_secondary_supers(Universe::the_empty_klass_array()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
901 return NULL; |
| 0 | 902 } else if (num_extra_slots == 0) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
903 // The secondary super list is exactly the same as the transitive interfaces. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
904 // Redefine classes has to be careful not to delete this! |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
905 set_secondary_supers(interfaces); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
906 return NULL; |
| 0 | 907 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
908 // Copy transitive interfaces to a temporary growable array to be constructed |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
909 // into the secondary super list with extra slots. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
910 GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(interfaces->length()); |
| 0 | 911 for (int i = 0; i < interfaces->length(); i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
912 secondaries->push(interfaces->at(i)); |
| 0 | 913 } |
| 914 return secondaries; | |
| 915 } | |
| 916 } | |
| 917 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
918 bool InstanceKlass::compute_is_subtype_of(Klass* k) { |
| 6983 | 919 if (k->is_interface()) { |
| 0 | 920 return implements_interface(k); |
| 921 } else { | |
| 922 return Klass::compute_is_subtype_of(k); | |
| 923 } | |
| 924 } | |
| 925 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
926 bool InstanceKlass::implements_interface(Klass* k) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
927 if (this == k) return true; |
| 6983 | 928 assert(k->is_interface(), "should be an interface class"); |
| 0 | 929 for (int i = 0; i < transitive_interfaces()->length(); i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
930 if (transitive_interfaces()->at(i) == k) { |
| 0 | 931 return true; |
| 932 } | |
| 933 } | |
| 934 return false; | |
| 935 } | |
| 936 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
937 objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) { |
| 0 | 938 if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); |
| 939 if (length > arrayOopDesc::max_array_length(T_OBJECT)) { | |
|
876
1413494da700
6850957: Honor -XX:OnOutOfMemoryError when array size exceeds VM limit
martin
parents:
875
diff
changeset
|
940 report_java_out_of_memory("Requested array size exceeds VM limit"); |
|
5935
a735aec54ea4
7123170: JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02
sspitsyn
parents:
4739
diff
changeset
|
941 JvmtiExport::post_array_size_exhausted(); |
| 0 | 942 THROW_OOP_0(Universe::out_of_memory_error_array_size()); |
| 943 } | |
| 944 int size = objArrayOopDesc::object_size(length); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
945 Klass* ak = array_klass(n, CHECK_NULL); |
| 0 | 946 KlassHandle h_ak (THREAD, ak); |
| 947 objArrayOop o = | |
| 948 (objArrayOop)CollectedHeap::array_allocate(h_ak, size, length, CHECK_NULL); | |
| 949 return o; | |
| 950 } | |
| 951 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
952 instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) { |
| 0 | 953 if (TraceFinalizerRegistration) { |
| 954 tty->print("Registered "); | |
| 955 i->print_value_on(tty); | |
| 956 tty->print_cr(" (" INTPTR_FORMAT ") as finalizable", (address)i); | |
| 957 } | |
| 958 instanceHandle h_i(THREAD, i); | |
| 959 // Pass the handle as argument, JavaCalls::call expects oop as jobjects | |
| 960 JavaValue result(T_VOID); | |
| 961 JavaCallArguments args(h_i); | |
| 962 methodHandle mh (THREAD, Universe::finalizer_register_method()); | |
| 963 JavaCalls::call(&result, mh, &args, CHECK_NULL); | |
| 964 return h_i(); | |
| 965 } | |
| 966 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
967 instanceOop InstanceKlass::allocate_instance(TRAPS) { |
| 0 | 968 bool has_finalizer_flag = has_finalizer(); // Query before possible GC |
| 969 int size = size_helper(); // Query before forming handle. | |
| 970 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
971 KlassHandle h_k(THREAD, this); |
| 0 | 972 |
| 973 instanceOop i; | |
| 974 | |
| 975 i = (instanceOop)CollectedHeap::obj_allocate(h_k, size, CHECK_NULL); | |
| 976 if (has_finalizer_flag && !RegisterFinalizersAtInit) { | |
| 977 i = register_finalizer(i, CHECK_NULL); | |
| 978 } | |
| 979 return i; | |
| 980 } | |
| 981 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
982 void InstanceKlass::check_valid_for_instantiation(bool throwError, TRAPS) { |
| 0 | 983 if (is_interface() || is_abstract()) { |
| 984 ResourceMark rm(THREAD); | |
| 985 THROW_MSG(throwError ? vmSymbols::java_lang_InstantiationError() | |
| 986 : vmSymbols::java_lang_InstantiationException(), external_name()); | |
| 987 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
988 if (this == SystemDictionary::Class_klass()) { |
| 0 | 989 ResourceMark rm(THREAD); |
| 990 THROW_MSG(throwError ? vmSymbols::java_lang_IllegalAccessError() | |
| 991 : vmSymbols::java_lang_IllegalAccessException(), external_name()); | |
| 992 } | |
| 993 } | |
| 994 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
995 Klass* InstanceKlass::array_klass_impl(bool or_null, int n, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
996 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 997 return array_klass_impl(this_oop, or_null, n, THREAD); |
| 998 } | |
| 999 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1000 Klass* InstanceKlass::array_klass_impl(instanceKlassHandle this_oop, bool or_null, int n, TRAPS) { |
| 0 | 1001 if (this_oop->array_klasses() == NULL) { |
| 1002 if (or_null) return NULL; | |
| 1003 | |
| 1004 ResourceMark rm; | |
| 1005 JavaThread *jt = (JavaThread *)THREAD; | |
| 1006 { | |
| 1007 // Atomic creation of array_klasses | |
| 1008 MutexLocker mc(Compile_lock, THREAD); // for vtables | |
| 1009 MutexLocker ma(MultiArray_lock, THREAD); | |
| 1010 | |
| 1011 // Check if update has already taken place | |
| 1012 if (this_oop->array_klasses() == NULL) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1013 Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); |
| 0 | 1014 this_oop->set_array_klasses(k); |
| 1015 } | |
| 1016 } | |
| 1017 } | |
| 1018 // _this will always be set at this point | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1019 ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses(); |
| 0 | 1020 if (or_null) { |
| 1021 return oak->array_klass_or_null(n); | |
| 1022 } | |
| 1023 return oak->array_klass(n, CHECK_NULL); | |
| 1024 } | |
| 1025 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1026 Klass* InstanceKlass::array_klass_impl(bool or_null, TRAPS) { |
| 0 | 1027 return array_klass_impl(or_null, 1, THREAD); |
| 1028 } | |
| 1029 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1030 void InstanceKlass::call_class_initializer(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1031 instanceKlassHandle ik (THREAD, this); |
| 0 | 1032 call_class_initializer_impl(ik, THREAD); |
| 1033 } | |
| 1034 | |
| 1035 static int call_class_initializer_impl_counter = 0; // for debugging | |
| 1036 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1037 Method* InstanceKlass::class_initializer() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1038 Method* clinit = find_method( |
|
2334
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1039 vmSymbols::class_initializer_name(), vmSymbols::void_method_signature()); |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1040 if (clinit != NULL && clinit->has_valid_initializer_flags()) { |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1041 return clinit; |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1042 } |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1043 return NULL; |
| 0 | 1044 } |
| 1045 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1046 void InstanceKlass::call_class_initializer_impl(instanceKlassHandle this_oop, TRAPS) { |
|
6972
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1047 if (ReplayCompiles && |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1048 (ReplaySuppressInitializers == 1 || |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1049 ReplaySuppressInitializers >= 2 && this_oop->class_loader() != NULL)) { |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1050 // Hide the existence of the initializer for the purpose of replaying the compile |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1051 return; |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1052 } |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1053 |
| 0 | 1054 methodHandle h_method(THREAD, this_oop->class_initializer()); |
| 1055 assert(!this_oop->is_initialized(), "we cannot initialize twice"); | |
| 1056 if (TraceClassInitialization) { | |
| 1057 tty->print("%d Initializing ", call_class_initializer_impl_counter++); | |
| 1058 this_oop->name()->print_value(); | |
| 1059 tty->print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", (address)this_oop()); | |
| 1060 } | |
| 1061 if (h_method() != NULL) { | |
| 1062 JavaCallArguments args; // No arguments | |
| 1063 JavaValue result(T_VOID); | |
| 1064 JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args) | |
| 1065 } | |
| 1066 } | |
| 1067 | |
| 1068 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1069 void InstanceKlass::mask_for(methodHandle method, int bci, |
| 0 | 1070 InterpreterOopMap* entry_for) { |
| 1071 // Dirty read, then double-check under a lock. | |
| 1072 if (_oop_map_cache == NULL) { | |
| 1073 // Otherwise, allocate a new one. | |
| 1074 MutexLocker x(OopMapCacheAlloc_lock); | |
| 1075 // First time use. Allocate a cache in C heap | |
| 1076 if (_oop_map_cache == NULL) { | |
| 1077 _oop_map_cache = new OopMapCache(); | |
| 1078 } | |
| 1079 } | |
| 1080 // _oop_map_cache is constant after init; lookup below does is own locking. | |
| 1081 _oop_map_cache->lookup(method, bci, entry_for); | |
| 1082 } | |
| 1083 | |
| 1084 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1085 bool InstanceKlass::find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1086 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1087 Symbol* f_name = fs.name(); |
| 1088 Symbol* f_sig = fs.signature(); | |
| 0 | 1089 if (f_name == name && f_sig == sig) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1090 fd->initialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1091 return true; |
| 1092 } | |
| 1093 } | |
| 1094 return false; | |
| 1095 } | |
| 1096 | |
| 1097 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1098 Klass* InstanceKlass::find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1099 const int n = local_interfaces()->length(); |
| 1100 for (int i = 0; i < n; i++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1101 Klass* intf1 = local_interfaces()->at(i); |
| 6983 | 1102 assert(intf1->is_interface(), "just checking type"); |
| 0 | 1103 // search for field in current interface |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1104 if (InstanceKlass::cast(intf1)->find_local_field(name, sig, fd)) { |
| 0 | 1105 assert(fd->is_static(), "interface field must be static"); |
| 1106 return intf1; | |
| 1107 } | |
| 1108 // search for field in direct superinterfaces | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1109 Klass* intf2 = InstanceKlass::cast(intf1)->find_interface_field(name, sig, fd); |
| 0 | 1110 if (intf2 != NULL) return intf2; |
| 1111 } | |
| 1112 // otherwise field lookup fails | |
| 1113 return NULL; | |
| 1114 } | |
| 1115 | |
| 1116 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1117 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1118 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1119 // 1) search for field in current klass | |
| 1120 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1121 return const_cast<InstanceKlass*>(this); |
| 0 | 1122 } |
| 1123 // 2) search for field recursively in direct superinterfaces | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1124 { Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1125 if (intf != NULL) return intf; |
| 1126 } | |
| 1127 // 3) apply field lookup recursively if superclass exists | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1128 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1129 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, fd); |
| 0 | 1130 } |
| 1131 // 4) otherwise field lookup fails | |
| 1132 return NULL; | |
| 1133 } | |
| 1134 | |
| 1135 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1136 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const { |
| 0 | 1137 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1138 // 1) search for field in current klass | |
| 1139 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1140 if (fd->is_static() == is_static) return const_cast<InstanceKlass*>(this); |
| 0 | 1141 } |
| 1142 // 2) search for field recursively in direct superinterfaces | |
| 1143 if (is_static) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1144 Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1145 if (intf != NULL) return intf; |
| 1146 } | |
| 1147 // 3) apply field lookup recursively if superclass exists | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1148 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1149 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, is_static, fd); |
| 0 | 1150 } |
| 1151 // 4) otherwise field lookup fails | |
| 1152 return NULL; | |
| 1153 } | |
| 1154 | |
| 1155 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1156 bool InstanceKlass::find_local_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1157 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1158 if (fs.offset() == offset) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1159 fd->initialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1160 if (fd->is_static() == is_static) return true; |
| 1161 } | |
| 1162 } | |
| 1163 return false; | |
| 1164 } | |
| 1165 | |
| 1166 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1167 bool InstanceKlass::find_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1168 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1169 while (klass != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1170 if (InstanceKlass::cast(klass)->find_local_field_from_offset(offset, is_static, fd)) { |
| 0 | 1171 return true; |
| 1172 } | |
| 6983 | 1173 klass = klass->super(); |
| 0 | 1174 } |
| 1175 return false; | |
| 1176 } | |
| 1177 | |
| 1178 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1179 void InstanceKlass::methods_do(void f(Method* method)) { |
| 0 | 1180 int len = methods()->length(); |
| 1181 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1182 Method* m = methods()->at(index); |
| 0 | 1183 assert(m->is_method(), "must be method"); |
| 1184 f(m); | |
| 1185 } | |
| 1186 } | |
| 1187 | |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
1188 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1189 void InstanceKlass::do_local_static_fields(FieldClosure* cl) { |
| 3938 | 1190 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 1191 if (fs.access_flags().is_static()) { | |
| 1192 fieldDescriptor fd; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1193 fd.initialize(this, fs.index()); |
| 3938 | 1194 cl->do_field(&fd); |
| 1195 } | |
| 0 | 1196 } |
| 1197 } | |
| 1198 | |
| 1199 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1200 void InstanceKlass::do_local_static_fields(void f(fieldDescriptor*, TRAPS), TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1201 instanceKlassHandle h_this(THREAD, this); |
| 0 | 1202 do_local_static_fields_impl(h_this, f, CHECK); |
| 1203 } | |
| 1204 | |
| 1205 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1206 void InstanceKlass::do_local_static_fields_impl(instanceKlassHandle this_oop, void f(fieldDescriptor* fd, TRAPS), TRAPS) { |
| 3938 | 1207 for (JavaFieldStream fs(this_oop()); !fs.done(); fs.next()) { |
| 1208 if (fs.access_flags().is_static()) { | |
| 1209 fieldDescriptor fd; | |
| 1210 fd.initialize(this_oop(), fs.index()); | |
| 1211 f(&fd, CHECK); | |
| 1212 } | |
| 0 | 1213 } |
| 1214 } | |
| 1215 | |
| 1216 | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1217 static int compare_fields_by_offset(int* a, int* b) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1218 return a[0] - b[0]; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1219 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1220 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1221 void InstanceKlass::do_nonstatic_fields(FieldClosure* cl) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1222 InstanceKlass* super = superklass(); |
| 0 | 1223 if (super != NULL) { |
| 1224 super->do_nonstatic_fields(cl); | |
| 1225 } | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1226 fieldDescriptor fd; |
| 3938 | 1227 int length = java_fields_count(); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1228 // In DebugInfo nonstatic fields are sorted by offset. |
| 6197 | 1229 int* fields_sorted = NEW_C_HEAP_ARRAY(int, 2*(length+1), mtClass); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1230 int j = 0; |
| 3938 | 1231 for (int i = 0; i < length; i += 1) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1232 fd.initialize(this, i); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1233 if (!fd.is_static()) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1234 fields_sorted[j + 0] = fd.offset(); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1235 fields_sorted[j + 1] = i; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1236 j += 2; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1237 } |
| 0 | 1238 } |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1239 if (j > 0) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1240 length = j; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1241 // _sort_Fn is defined in growableArray.hpp. |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1242 qsort(fields_sorted, length/2, 2*sizeof(int), (_sort_Fn)compare_fields_by_offset); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1243 for (int i = 0; i < length; i += 2) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1244 fd.initialize(this, fields_sorted[i + 1]); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1245 assert(!fd.is_static() && fd.offset() == fields_sorted[i], "only nonstatic fields"); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1246 cl->do_field(&fd); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1247 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1248 } |
| 6197 | 1249 FREE_C_HEAP_ARRAY(int, fields_sorted, mtClass); |
| 0 | 1250 } |
| 1251 | |
| 1252 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1253 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1254 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1255 ArrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1256 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1257 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1258 void InstanceKlass::array_klasses_do(void f(Klass* k)) { |
| 0 | 1259 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1260 ArrayKlass::cast(array_klasses())->array_klasses_do(f); |
| 0 | 1261 } |
| 1262 | |
| 1263 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1264 void InstanceKlass::with_array_klasses_do(void f(Klass* k)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1265 f(this); |
| 0 | 1266 array_klasses_do(f); |
| 1267 } | |
| 1268 | |
| 1269 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1270 static int linear_search(Array<Method*>* methods, Symbol* name, Symbol* signature) { |
| 0 | 1271 int len = methods->length(); |
| 1272 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1273 Method* m = methods->at(index); |
| 0 | 1274 assert(m->is_method(), "must be method"); |
| 1275 if (m->signature() == signature && m->name() == name) { | |
| 1276 return index; | |
| 1277 } | |
| 1278 } | |
| 1279 return -1; | |
| 1280 } | |
| 1281 #endif | |
| 1282 | |
| 6934 | 1283 static int binary_search(Array<Method*>* methods, Symbol* name) { |
| 0 | 1284 int len = methods->length(); |
| 1285 // methods are sorted, so do binary search | |
| 1286 int l = 0; | |
| 1287 int h = len - 1; | |
| 1288 while (l <= h) { | |
| 1289 int mid = (l + h) >> 1; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1290 Method* m = methods->at(mid); |
| 0 | 1291 assert(m->is_method(), "must be method"); |
| 1292 int res = m->name()->fast_compare(name); | |
| 1293 if (res == 0) { | |
| 6934 | 1294 return mid; |
| 0 | 1295 } else if (res < 0) { |
| 1296 l = mid + 1; | |
| 1297 } else { | |
| 1298 h = mid - 1; | |
| 1299 } | |
| 1300 } | |
| 6934 | 1301 return -1; |
| 1302 } | |
| 1303 | |
| 1304 Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const { | |
| 1305 return InstanceKlass::find_method(methods(), name, signature); | |
| 1306 } | |
| 1307 | |
| 1308 Method* InstanceKlass::find_method( | |
| 1309 Array<Method*>* methods, Symbol* name, Symbol* signature) { | |
| 1310 int hit = binary_search(methods, name); | |
| 1311 if (hit != -1) { | |
| 1312 Method* m = methods->at(hit); | |
| 1313 // Do linear search to find matching signature. First, quick check | |
| 1314 // for common case | |
| 1315 if (m->signature() == signature) return m; | |
| 1316 // search downwards through overloaded methods | |
| 1317 int i; | |
| 1318 for (i = hit - 1; i >= 0; --i) { | |
| 1319 Method* m = methods->at(i); | |
| 1320 assert(m->is_method(), "must be method"); | |
| 1321 if (m->name() != name) break; | |
| 1322 if (m->signature() == signature) return m; | |
| 1323 } | |
| 1324 // search upwards | |
| 1325 for (i = hit + 1; i < methods->length(); ++i) { | |
| 1326 Method* m = methods->at(i); | |
| 1327 assert(m->is_method(), "must be method"); | |
| 1328 if (m->name() != name) break; | |
| 1329 if (m->signature() == signature) return m; | |
| 1330 } | |
| 1331 // not found | |
| 0 | 1332 #ifdef ASSERT |
| 6934 | 1333 int index = linear_search(methods, name, signature); |
| 1334 assert(index == -1, err_msg("binary search should have found entry %d", index)); | |
| 0 | 1335 #endif |
| 6934 | 1336 } |
| 0 | 1337 return NULL; |
| 1338 } | |
| 1339 | |
| 6934 | 1340 int InstanceKlass::find_method_by_name(Symbol* name, int* end) { |
| 1341 return find_method_by_name(methods(), name, end); | |
| 1342 } | |
| 1343 | |
| 1344 int InstanceKlass::find_method_by_name( | |
| 1345 Array<Method*>* methods, Symbol* name, int* end_ptr) { | |
| 1346 assert(end_ptr != NULL, "just checking"); | |
| 1347 int start = binary_search(methods, name); | |
| 1348 int end = start + 1; | |
| 1349 if (start != -1) { | |
| 1350 while (start - 1 >= 0 && (methods->at(start - 1))->name() == name) --start; | |
| 1351 while (end < methods->length() && (methods->at(end))->name() == name) ++end; | |
| 1352 *end_ptr = end; | |
| 1353 return start; | |
| 1354 } | |
| 1355 return -1; | |
| 1356 } | |
| 1357 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1358 Method* InstanceKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1359 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1360 while (klass != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1361 Method* method = InstanceKlass::cast(klass)->find_method(name, signature); |
| 0 | 1362 if (method != NULL) return method; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1363 klass = InstanceKlass::cast(klass)->super(); |
| 0 | 1364 } |
| 1365 return NULL; | |
| 1366 } | |
| 1367 | |
| 1368 // lookup a method in all the interfaces that this class implements | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1369 Method* InstanceKlass::lookup_method_in_all_interfaces(Symbol* name, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
1370 Symbol* signature) const { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1371 Array<Klass*>* all_ifs = transitive_interfaces(); |
| 0 | 1372 int num_ifs = all_ifs->length(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1373 InstanceKlass *ik = NULL; |
| 0 | 1374 for (int i = 0; i < num_ifs; i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1375 ik = InstanceKlass::cast(all_ifs->at(i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1376 Method* m = ik->lookup_method(name, signature); |
| 0 | 1377 if (m != NULL) { |
| 1378 return m; | |
| 1379 } | |
| 1380 } | |
| 1381 return NULL; | |
| 1382 } | |
| 1383 | |
| 1384 /* jni_id_for_impl for jfieldIds only */ | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1385 JNIid* InstanceKlass::jni_id_for_impl(instanceKlassHandle this_oop, int offset) { |
| 0 | 1386 MutexLocker ml(JfieldIdCreation_lock); |
| 1387 // Retry lookup after we got the lock | |
| 1388 JNIid* probe = this_oop->jni_ids() == NULL ? NULL : this_oop->jni_ids()->find(offset); | |
| 1389 if (probe == NULL) { | |
| 1390 // Slow case, allocate new static field identifier | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1391 probe = new JNIid(this_oop(), offset, this_oop->jni_ids()); |
| 0 | 1392 this_oop->set_jni_ids(probe); |
| 1393 } | |
| 1394 return probe; | |
| 1395 } | |
| 1396 | |
| 1397 | |
| 1398 /* jni_id_for for jfieldIds only */ | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1399 JNIid* InstanceKlass::jni_id_for(int offset) { |
| 0 | 1400 JNIid* probe = jni_ids() == NULL ? NULL : jni_ids()->find(offset); |
| 1401 if (probe == NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1402 probe = jni_id_for_impl(this, offset); |
| 0 | 1403 } |
| 1404 return probe; | |
| 1405 } | |
| 1406 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1407 u2 InstanceKlass::enclosing_method_data(int offset) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1408 Array<jushort>* inner_class_list = inner_classes(); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1409 if (inner_class_list == NULL) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1410 return 0; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1411 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1412 int length = inner_class_list->length(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1413 if (length % inner_class_next_offset == 0) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1414 return 0; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1415 } else { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1416 int index = length - enclosing_method_attribute_size; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1417 assert(offset < enclosing_method_attribute_size, "invalid offset"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1418 return inner_class_list->at(index + offset); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1419 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1420 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1421 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1422 void InstanceKlass::set_enclosing_method_indices(u2 class_index, |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1423 u2 method_index) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1424 Array<jushort>* inner_class_list = inner_classes(); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1425 assert (inner_class_list != NULL, "_inner_classes list is not set up"); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1426 int length = inner_class_list->length(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1427 if (length % inner_class_next_offset == enclosing_method_attribute_size) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1428 int index = length - enclosing_method_attribute_size; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1429 inner_class_list->at_put( |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1430 index + enclosing_method_class_index_offset, class_index); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1431 inner_class_list->at_put( |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1432 index + enclosing_method_method_index_offset, method_index); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1433 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1434 } |
| 0 | 1435 |
| 1436 // Lookup or create a jmethodID. | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1437 // This code is called by the VMThread and JavaThreads so the |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1438 // locking has to be done very carefully to avoid deadlocks |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1439 // and/or other cache consistency problems. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1440 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1441 jmethodID InstanceKlass::get_jmethod_id(instanceKlassHandle ik_h, methodHandle method_h) { |
| 0 | 1442 size_t idnum = (size_t)method_h->method_idnum(); |
| 1443 jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire(); | |
| 1444 size_t length = 0; | |
| 1445 jmethodID id = NULL; | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1446 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1447 // We use a double-check locking idiom here because this cache is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1448 // performance sensitive. In the normal system, this cache only |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1449 // transitions from NULL to non-NULL which is safe because we use |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1450 // release_set_methods_jmethod_ids() to advertise the new cache. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1451 // A partially constructed cache should never be seen by a racing |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1452 // thread. We also use release_store_ptr() to save a new jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1453 // in the cache so a partially constructed jmethodID should never be |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1454 // seen either. Cache reads of existing jmethodIDs proceed without a |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1455 // lock, but cache writes of a new jmethodID requires uniqueness and |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1456 // creation of the cache itself requires no leaks so a lock is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1457 // generally acquired in those two cases. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1458 // |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1459 // If the RedefineClasses() API has been used, then this cache can |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1460 // grow and we'll have transitions from non-NULL to bigger non-NULL. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1461 // Cache creation requires no leaks and we require safety between all |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1462 // cache accesses and freeing of the old cache so a lock is generally |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1463 // acquired when the RedefineClasses() API has been used. |
| 0 | 1464 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1465 if (jmeths != NULL) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1466 // the cache already exists |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1467 if (!ik_h->idnum_can_increment()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1468 // the cache can't grow so we can just get the current values |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1469 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1470 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1471 // cache can grow so we have to be more careful |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1472 if (Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1473 SafepointSynchronize::is_at_safepoint()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1474 // we're single threaded or at a safepoint - no locking needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1475 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1476 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1477 MutexLocker ml(JmethodIdCreation_lock); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1478 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1479 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1480 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1481 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1482 // implied else: |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1483 // we need to allocate a cache so default length and id values are good |
| 0 | 1484 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1485 if (jmeths == NULL || // no cache yet |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1486 length <= idnum || // cache is too short |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1487 id == NULL) { // cache doesn't contain entry |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1488 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1489 // This function can be called by the VMThread so we have to do all |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1490 // things that might block on a safepoint before grabbing the lock. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1491 // Otherwise, we can deadlock with the VMThread or have a cache |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1492 // consistency issue. These vars keep track of what we might have |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1493 // to free after the lock is dropped. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1494 jmethodID to_dealloc_id = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1495 jmethodID* to_dealloc_jmeths = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1496 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1497 // may not allocate new_jmeths or use it if we allocate it |
| 0 | 1498 jmethodID* new_jmeths = NULL; |
| 1499 if (length <= idnum) { | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1500 // allocate a new cache that might be used |
| 0 | 1501 size_t size = MAX2(idnum+1, (size_t)ik_h->idnum_allocated_count()); |
| 6197 | 1502 new_jmeths = NEW_C_HEAP_ARRAY(jmethodID, size+1, mtClass); |
| 0 | 1503 memset(new_jmeths, 0, (size+1)*sizeof(jmethodID)); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1504 // cache size is stored in element[0], other elements offset by one |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1505 new_jmeths[0] = (jmethodID)size; |
| 0 | 1506 } |
| 1507 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1508 // allocate a new jmethodID that might be used |
| 0 | 1509 jmethodID new_id = NULL; |
| 1510 if (method_h->is_old() && !method_h->is_obsolete()) { | |
| 1511 // The method passed in is old (but not obsolete), we need to use the current version | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1512 Method* current_method = ik_h->method_with_idnum((int)idnum); |
| 0 | 1513 assert(current_method != NULL, "old and but not obsolete, so should exist"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1514 new_id = Method::make_jmethod_id(ik_h->class_loader_data(), current_method); |
| 0 | 1515 } else { |
| 1516 // It is the current version of the method or an obsolete method, | |
| 1517 // use the version passed in | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1518 new_id = Method::make_jmethod_id(ik_h->class_loader_data(), method_h()); |
| 0 | 1519 } |
| 1520 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1521 if (Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1522 SafepointSynchronize::is_at_safepoint()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1523 // we're single threaded or at a safepoint - no locking needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1524 id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1525 &to_dealloc_id, &to_dealloc_jmeths); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1526 } else { |
| 0 | 1527 MutexLocker ml(JmethodIdCreation_lock); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1528 id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1529 &to_dealloc_id, &to_dealloc_jmeths); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1530 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1531 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1532 // The lock has been dropped so we can free resources. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1533 // Free up either the old cache or the new cache if we allocated one. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1534 if (to_dealloc_jmeths != NULL) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1535 FreeHeap(to_dealloc_jmeths); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1536 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1537 // free up the new ID since it wasn't needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1538 if (to_dealloc_id != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1539 Method::destroy_jmethod_id(ik_h->class_loader_data(), to_dealloc_id); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1540 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1541 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1542 return id; |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1543 } |
| 0 | 1544 |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1545 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1546 // Common code to fetch the jmethodID from the cache or update the |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1547 // cache with the new jmethodID. This function should never do anything |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1548 // that causes the caller to go to a safepoint or we can deadlock with |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1549 // the VMThread or have cache consistency issues. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1550 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1551 jmethodID InstanceKlass::get_jmethod_id_fetch_or_update( |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1552 instanceKlassHandle ik_h, size_t idnum, jmethodID new_id, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1553 jmethodID* new_jmeths, jmethodID* to_dealloc_id_p, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1554 jmethodID** to_dealloc_jmeths_p) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1555 assert(new_id != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1556 assert(to_dealloc_id_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1557 assert(to_dealloc_jmeths_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1558 assert(Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1559 SafepointSynchronize::is_at_safepoint() || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1560 JmethodIdCreation_lock->owned_by_self(), "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1561 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1562 // reacquire the cache - we are locked, single threaded or at a safepoint |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1563 jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire(); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1564 jmethodID id = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1565 size_t length = 0; |
| 0 | 1566 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1567 if (jmeths == NULL || // no cache yet |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1568 (length = (size_t)jmeths[0]) <= idnum) { // cache is too short |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1569 if (jmeths != NULL) { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1570 // copy any existing entries from the old cache |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1571 for (size_t index = 0; index < length; index++) { |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1572 new_jmeths[index+1] = jmeths[index+1]; |
| 0 | 1573 } |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1574 *to_dealloc_jmeths_p = jmeths; // save old cache for later delete |
| 0 | 1575 } |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1576 ik_h->release_set_methods_jmethod_ids(jmeths = new_jmeths); |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1577 } else { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1578 // fetch jmethodID (if any) from the existing cache |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1579 id = jmeths[idnum+1]; |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1580 *to_dealloc_jmeths_p = new_jmeths; // save new cache for later delete |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1581 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1582 if (id == NULL) { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1583 // No matching jmethodID in the existing cache or we have a new |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1584 // cache or we just grew the cache. This cache write is done here |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1585 // by the first thread to win the foot race because a jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1586 // needs to be unique once it is generally available. |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1587 id = new_id; |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1588 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1589 // The jmethodID cache can be read while unlocked so we have to |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1590 // make sure the new jmethodID is complete before installing it |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1591 // in the cache. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1592 OrderAccess::release_store_ptr(&jmeths[idnum+1], id); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1593 } else { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1594 *to_dealloc_id_p = new_id; // save new id for later delete |
| 0 | 1595 } |
| 1596 return id; | |
| 1597 } | |
| 1598 | |
| 1599 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1600 // Common code to get the jmethodID cache length and the jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1601 // value at index idnum if there is one. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1602 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1603 void InstanceKlass::get_jmethod_id_length_value(jmethodID* cache, |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1604 size_t idnum, size_t *length_p, jmethodID* id_p) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1605 assert(cache != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1606 assert(length_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1607 assert(id_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1608 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1609 // cache size is stored in element[0], other elements offset by one |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1610 *length_p = (size_t)cache[0]; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1611 if (*length_p <= idnum) { // cache is too short |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1612 *id_p = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1613 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1614 *id_p = cache[idnum+1]; // fetch jmethodID (if any) |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1615 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1616 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1617 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1618 |
| 0 | 1619 // Lookup a jmethodID, NULL if not found. Do no blocking, no allocations, no handles |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1620 jmethodID InstanceKlass::jmethod_id_or_null(Method* method) { |
| 0 | 1621 size_t idnum = (size_t)method->method_idnum(); |
| 1622 jmethodID* jmeths = methods_jmethod_ids_acquire(); | |
| 1623 size_t length; // length assigned as debugging crumb | |
| 1624 jmethodID id = NULL; | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1625 if (jmeths != NULL && // If there is a cache |
| 0 | 1626 (length = (size_t)jmeths[0]) > idnum) { // and if it is long enough, |
| 1627 id = jmeths[idnum+1]; // Look up the id (may be NULL) | |
| 1628 } | |
| 1629 return id; | |
| 1630 } | |
| 1631 | |
| 1632 | |
| 1633 // Cache an itable index | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1634 void InstanceKlass::set_cached_itable_index(size_t idnum, int index) { |
| 0 | 1635 int* indices = methods_cached_itable_indices_acquire(); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1636 int* to_dealloc_indices = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1637 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1638 // We use a double-check locking idiom here because this cache is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1639 // performance sensitive. In the normal system, this cache only |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1640 // transitions from NULL to non-NULL which is safe because we use |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1641 // release_set_methods_cached_itable_indices() to advertise the |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1642 // new cache. A partially constructed cache should never be seen |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1643 // by a racing thread. Cache reads and writes proceed without a |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1644 // lock, but creation of the cache itself requires no leaks so a |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1645 // lock is generally acquired in that case. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1646 // |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1647 // If the RedefineClasses() API has been used, then this cache can |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1648 // grow and we'll have transitions from non-NULL to bigger non-NULL. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1649 // Cache creation requires no leaks and we require safety between all |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1650 // cache accesses and freeing of the old cache so a lock is generally |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1651 // acquired when the RedefineClasses() API has been used. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1652 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1653 if (indices == NULL || idnum_can_increment()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1654 // we need a cache or the cache can grow |
| 0 | 1655 MutexLocker ml(JNICachedItableIndex_lock); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1656 // reacquire the cache to see if another thread already did the work |
| 0 | 1657 indices = methods_cached_itable_indices_acquire(); |
| 1658 size_t length = 0; | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1659 // cache size is stored in element[0], other elements offset by one |
| 0 | 1660 if (indices == NULL || (length = (size_t)indices[0]) <= idnum) { |
| 1661 size_t size = MAX2(idnum+1, (size_t)idnum_allocated_count()); | |
| 6197 | 1662 int* new_indices = NEW_C_HEAP_ARRAY(int, size+1, mtClass); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1663 new_indices[0] = (int)size; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1664 // copy any existing entries |
| 0 | 1665 size_t i; |
| 1666 for (i = 0; i < length; i++) { | |
| 1667 new_indices[i+1] = indices[i+1]; | |
| 1668 } | |
| 1669 // Set all the rest to -1 | |
| 1670 for (i = length; i < size; i++) { | |
| 1671 new_indices[i+1] = -1; | |
| 1672 } | |
| 1673 if (indices != NULL) { | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1674 // We have an old cache to delete so save it for after we |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1675 // drop the lock. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1676 to_dealloc_indices = indices; |
| 0 | 1677 } |
| 1678 release_set_methods_cached_itable_indices(indices = new_indices); | |
| 1679 } | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1680 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1681 if (idnum_can_increment()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1682 // this cache can grow so we have to write to it safely |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1683 indices[idnum+1] = index; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1684 } |
| 0 | 1685 } else { |
| 1686 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops()); | |
| 1687 } | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1688 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1689 if (!idnum_can_increment()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1690 // The cache cannot grow and this JNI itable index value does not |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1691 // have to be unique like a jmethodID. If there is a race to set it, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1692 // it doesn't matter. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1693 indices[idnum+1] = index; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1694 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1695 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1696 if (to_dealloc_indices != NULL) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1697 // we allocated a new cache so free the old one |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1698 FreeHeap(to_dealloc_indices); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1699 } |
| 0 | 1700 } |
| 1701 | |
| 1702 | |
| 1703 // Retrieve a cached itable index | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1704 int InstanceKlass::cached_itable_index(size_t idnum) { |
| 0 | 1705 int* indices = methods_cached_itable_indices_acquire(); |
| 1706 if (indices != NULL && ((size_t)indices[0]) > idnum) { | |
| 1707 // indices exist and are long enough, retrieve possible cached | |
| 1708 return indices[idnum+1]; | |
| 1709 } | |
| 1710 return -1; | |
| 1711 } | |
| 1712 | |
| 1713 | |
| 1714 // | |
| 1715 // Walk the list of dependent nmethods searching for nmethods which | |
|
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
3748
diff
changeset
|
1716 // are dependent on the changes that were passed in and mark them for |
| 0 | 1717 // deoptimization. Returns the number of nmethods found. |
| 1718 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1719 int InstanceKlass::mark_dependent_nmethods(DepChange& changes) { |
| 0 | 1720 assert_locked_or_safepoint(CodeCache_lock); |
| 1721 int found = 0; | |
| 1722 nmethodBucket* b = _dependencies; | |
| 1723 while (b != NULL) { | |
| 1724 nmethod* nm = b->get_nmethod(); | |
| 1725 // since dependencies aren't removed until an nmethod becomes a zombie, | |
| 1726 // the dependency list may contain nmethods which aren't alive. | |
| 1727 if (nm->is_alive() && !nm->is_marked_for_deoptimization() && nm->check_dependency_on(changes)) { | |
| 1728 if (TraceDependencies) { | |
| 1729 ResourceMark rm; | |
| 1730 tty->print_cr("Marked for deoptimization"); | |
| 1731 tty->print_cr(" context = %s", this->external_name()); | |
| 1732 changes.print(); | |
| 1733 nm->print(); | |
| 1734 nm->print_dependencies(); | |
| 1735 } | |
| 1736 nm->mark_for_deoptimization(); | |
| 1737 found++; | |
| 1738 } | |
| 1739 b = b->next(); | |
| 1740 } | |
| 1741 return found; | |
| 1742 } | |
| 1743 | |
| 1744 | |
| 1745 // | |
| 1746 // Add an nmethodBucket to the list of dependencies for this nmethod. | |
| 1747 // It's possible that an nmethod has multiple dependencies on this klass | |
| 1748 // so a count is kept for each bucket to guarantee that creation and | |
| 1749 // deletion of dependencies is consistent. | |
| 1750 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1751 void InstanceKlass::add_dependent_nmethod(nmethod* nm) { |
| 0 | 1752 assert_locked_or_safepoint(CodeCache_lock); |
| 1753 nmethodBucket* b = _dependencies; | |
| 1754 nmethodBucket* last = NULL; | |
| 1755 while (b != NULL) { | |
| 1756 if (nm == b->get_nmethod()) { | |
| 1757 b->increment(); | |
| 1758 return; | |
| 1759 } | |
| 1760 b = b->next(); | |
| 1761 } | |
| 1762 _dependencies = new nmethodBucket(nm, _dependencies); | |
| 1763 } | |
| 1764 | |
| 1765 | |
| 1766 // | |
| 1767 // Decrement count of the nmethod in the dependency list and remove | |
| 1768 // the bucket competely when the count goes to 0. This method must | |
| 1769 // find a corresponding bucket otherwise there's a bug in the | |
| 1770 // recording of dependecies. | |
| 1771 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1772 void InstanceKlass::remove_dependent_nmethod(nmethod* nm) { |
| 0 | 1773 assert_locked_or_safepoint(CodeCache_lock); |
| 1774 nmethodBucket* b = _dependencies; | |
| 1775 nmethodBucket* last = NULL; | |
| 1776 while (b != NULL) { | |
| 1777 if (nm == b->get_nmethod()) { | |
| 1778 if (b->decrement() == 0) { | |
| 1779 if (last == NULL) { | |
| 1780 _dependencies = b->next(); | |
| 1781 } else { | |
| 1782 last->set_next(b->next()); | |
| 1783 } | |
| 1784 delete b; | |
| 1785 } | |
| 1786 return; | |
| 1787 } | |
| 1788 last = b; | |
| 1789 b = b->next(); | |
| 1790 } | |
| 1791 #ifdef ASSERT | |
| 1792 tty->print_cr("### %s can't find dependent nmethod:", this->external_name()); | |
| 1793 nm->print(); | |
| 1794 #endif // ASSERT | |
| 1795 ShouldNotReachHere(); | |
| 1796 } | |
| 1797 | |
| 1798 | |
| 1799 #ifndef PRODUCT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1800 void InstanceKlass::print_dependent_nmethods(bool verbose) { |
| 0 | 1801 nmethodBucket* b = _dependencies; |
| 1802 int idx = 0; | |
| 1803 while (b != NULL) { | |
| 1804 nmethod* nm = b->get_nmethod(); | |
| 1805 tty->print("[%d] count=%d { ", idx++, b->count()); | |
| 1806 if (!verbose) { | |
| 1807 nm->print_on(tty, "nmethod"); | |
| 1808 tty->print_cr(" } "); | |
| 1809 } else { | |
| 1810 nm->print(); | |
| 1811 nm->print_dependencies(); | |
| 1812 tty->print_cr("--- } "); | |
| 1813 } | |
| 1814 b = b->next(); | |
| 1815 } | |
| 1816 } | |
| 1817 | |
| 1818 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1819 bool InstanceKlass::is_dependent_nmethod(nmethod* nm) { |
| 0 | 1820 nmethodBucket* b = _dependencies; |
| 1821 while (b != NULL) { | |
| 1822 if (nm == b->get_nmethod()) { | |
| 1823 return true; | |
| 1824 } | |
| 1825 b = b->next(); | |
| 1826 } | |
| 1827 return false; | |
| 1828 } | |
| 1829 #endif //PRODUCT | |
| 1830 | |
| 1831 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1832 // Garbage collection |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1833 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1834 void InstanceKlass::oops_do(OopClosure* cl) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1835 Klass::oops_do(cl); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1836 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1837 cl->do_oop(adr_protection_domain()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1838 cl->do_oop(adr_signers()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1839 cl->do_oop(adr_init_lock()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1840 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1841 // Don't walk the arrays since they are walked from the ClassLoaderData objects. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1842 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1843 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1844 #ifdef ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1845 template <class T> void assert_is_in(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1846 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1847 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1848 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1849 assert(Universe::heap()->is_in(o), "should be in heap"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1850 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1851 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1852 template <class T> void assert_is_in_closed_subset(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1853 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1854 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1855 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1856 assert(Universe::heap()->is_in_closed_subset(o), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1857 err_msg("should be in closed *p " INTPTR_FORMAT " " INTPTR_FORMAT, (address)p, (address)o)); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1858 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1859 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1860 template <class T> void assert_is_in_reserved(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1861 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1862 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1863 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1864 assert(Universe::heap()->is_in_reserved(o), "should be in reserved"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1865 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1866 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1867 template <class T> void assert_nothing(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1868 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1869 #else |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1870 template <class T> void assert_is_in(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1871 template <class T> void assert_is_in_closed_subset(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1872 template <class T> void assert_is_in_reserved(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1873 template <class T> void assert_nothing(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1874 #endif // ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1875 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1876 // |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1877 // Macros that iterate over areas of oops which are specialized on type of |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1878 // oop pointer either narrow or wide, depending on UseCompressedOops |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1879 // |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1880 // Parameters are: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1881 // T - type of oop to point to (either oop or narrowOop) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1882 // start_p - starting pointer for region to iterate over |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1883 // count - number of oops or narrowOops to iterate over |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1884 // do_oop - action to perform on each oop (it's arbitrary C code which |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1885 // makes it more efficient to put in a macro rather than making |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1886 // it a template function) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1887 // assert_fn - assert function which is template function because performance |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1888 // doesn't matter when enabled. |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1889 #define InstanceKlass_SPECIALIZED_OOP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1890 T, start_p, count, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1891 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1892 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1893 T* p = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1894 T* const end = p + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1895 while (p < end) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1896 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1897 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1898 ++p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1899 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1900 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1901 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1902 #define InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1903 T, start_p, count, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1904 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1905 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1906 T* const start = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1907 T* p = start + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1908 while (start < p) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1909 --p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1910 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1911 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1912 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1913 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1914 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1915 #define InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1916 T, start_p, count, low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1917 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1918 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1919 T* const l = (T*)(low); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1920 T* const h = (T*)(high); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1921 assert(mask_bits((intptr_t)l, sizeof(T)-1) == 0 && \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1922 mask_bits((intptr_t)h, sizeof(T)-1) == 0, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1923 "bounded region must be properly aligned"); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1924 T* p = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1925 T* end = p + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1926 if (p < l) p = l; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1927 if (end > h) end = h; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1928 while (p < end) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1929 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1930 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1931 ++p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1932 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1933 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1934 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1935 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1936 // The following macros call specialized macros, passing either oop or |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1937 // narrowOop as the specialization type. These test the UseCompressedOops |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1938 // flag. |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1939 #define InstanceKlass_OOP_MAP_ITERATE(obj, do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1940 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1941 /* Compute oopmap block range. The common case \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1942 is nonstatic_oop_map_size == 1. */ \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1943 OopMapBlock* map = start_of_nonstatic_oop_maps(); \ |
| 938 | 1944 OopMapBlock* const end_map = map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1945 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1946 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1947 InstanceKlass_SPECIALIZED_OOP_ITERATE(narrowOop, \ |
| 938 | 1948 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1949 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1950 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1951 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1952 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1953 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1954 InstanceKlass_SPECIALIZED_OOP_ITERATE(oop, \ |
| 938 | 1955 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1956 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1957 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1958 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1959 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1960 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1961 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1962 #define InstanceKlass_OOP_MAP_REVERSE_ITERATE(obj, do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1963 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1964 OopMapBlock* const start_map = start_of_nonstatic_oop_maps(); \ |
| 938 | 1965 OopMapBlock* map = start_map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1966 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1967 while (start_map < map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1968 --map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1969 InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(narrowOop, \ |
| 938 | 1970 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1971 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1972 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1973 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1974 while (start_map < map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1975 --map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1976 InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(oop, \ |
| 938 | 1977 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1978 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1979 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1980 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1981 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1982 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1983 #define InstanceKlass_BOUNDED_OOP_MAP_ITERATE(obj, low, high, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1984 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1985 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1986 /* Compute oopmap block range. The common case is \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1987 nonstatic_oop_map_size == 1, so we accept the \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1988 usually non-existent extra overhead of examining \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1989 all the maps. */ \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1990 OopMapBlock* map = start_of_nonstatic_oop_maps(); \ |
| 938 | 1991 OopMapBlock* const end_map = map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1992 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1993 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1994 InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop, \ |
| 938 | 1995 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1996 low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1997 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1998 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1999 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2000 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2001 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2002 InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop, \ |
| 938 | 2003 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2004 low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2005 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2006 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2007 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2008 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2009 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2010 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2011 void InstanceKlass::oop_follow_contents(oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2012 assert(obj != NULL, "can't follow the content of NULL object"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2013 MarkSweep::follow_klass(obj->klass()); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2014 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2015 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2016 MarkSweep::mark_and_push(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2017 assert_is_in_closed_subset) |
| 0 | 2018 } |
| 2019 | |
| 2020 #ifndef SERIALGC | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2021 void InstanceKlass::oop_follow_contents(ParCompactionManager* cm, |
| 0 | 2022 oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2023 assert(obj != NULL, "can't follow the content of NULL object"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2024 PSParallelCompact::follow_klass(cm, obj->klass()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2025 // Only mark the header and let the scan of the meta-data mark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2026 // everything else. |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2027 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2028 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2029 PSParallelCompact::mark_and_push(cm, p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2030 assert_is_in) |
| 0 | 2031 } |
| 2032 #endif // SERIALGC | |
| 2033 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2034 // closure's do_metadata() method dictates whether the given closure should be |
| 0 | 2035 // applied to the klass ptr in the object header. |
| 2036 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2037 #define if_do_metadata_checked(closure, nv_suffix) \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2038 /* Make sure the non-virtual and the virtual versions match. */ \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2039 assert(closure->do_metadata##nv_suffix() == closure->do_metadata(), \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2040 "Inconsistency in do_metadata"); \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2041 if (closure->do_metadata##nv_suffix()) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2042 |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2043 #define InstanceKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2044 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2045 int InstanceKlass::oop_oop_iterate##nv_suffix(oop obj, OopClosureType* closure) { \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2046 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik);\ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2047 /* header */ \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2048 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2049 closure->do_klass##nv_suffix(obj->klass()); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2050 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2051 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2052 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2053 SpecializationStats:: \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2054 record_do_oop_call##nv_suffix(SpecializationStats::ik); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2055 (closure)->do_oop##nv_suffix(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2056 assert_is_in_closed_subset) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2057 return size_helper(); \ |
| 0 | 2058 } |
| 2059 | |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2060 #ifndef SERIALGC |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2061 #define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2062 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2063 int InstanceKlass::oop_oop_iterate_backwards##nv_suffix(oop obj, \ |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2064 OopClosureType* closure) { \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2065 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik); \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2066 /* header */ \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2067 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2068 closure->do_klass##nv_suffix(obj->klass()); \ |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2069 } \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2070 /* instance variables */ \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2071 InstanceKlass_OOP_MAP_REVERSE_ITERATE( \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2072 obj, \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2073 SpecializationStats::record_do_oop_call##nv_suffix(SpecializationStats::ik);\ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2074 (closure)->do_oop##nv_suffix(p), \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2075 assert_is_in_closed_subset) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2076 return size_helper(); \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2077 } |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2078 #endif // !SERIALGC |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2079 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2080 #define InstanceKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2081 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2082 int InstanceKlass::oop_oop_iterate##nv_suffix##_m(oop obj, \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2083 OopClosureType* closure, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2084 MemRegion mr) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2085 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik);\ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2086 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2087 if (mr.contains(obj)) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2088 closure->do_klass##nv_suffix(obj->klass()); \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2089 } \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2090 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2091 InstanceKlass_BOUNDED_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2092 obj, mr.start(), mr.end(), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2093 (closure)->do_oop##nv_suffix(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2094 assert_is_in_closed_subset) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2095 return size_helper(); \ |
| 0 | 2096 } |
| 2097 | |
| 2098 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN) | |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2099 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN) |
| 0 | 2100 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN_m) |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2101 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN_m) |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2102 #ifndef SERIALGC |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2103 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2104 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2105 #endif // !SERIALGC |
| 0 | 2106 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2107 int InstanceKlass::oop_adjust_pointers(oop obj) { |
| 0 | 2108 int size = size_helper(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2109 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2110 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2111 MarkSweep::adjust_pointer(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2112 assert_is_in) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2113 MarkSweep::adjust_klass(obj->klass()); |
| 0 | 2114 return size; |
| 2115 } | |
| 2116 | |
| 2117 #ifndef SERIALGC | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2118 void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2119 InstanceKlass_OOP_MAP_REVERSE_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2120 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2121 if (PSScavenge::should_scavenge(p)) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2122 pm->claim_or_forward_depth(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2123 }, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2124 assert_nothing ) |
| 0 | 2125 } |
| 2126 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2127 int InstanceKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2128 int size = size_helper(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2129 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2130 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2131 PSParallelCompact::adjust_pointer(p), \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2132 assert_is_in) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2133 obj->update_header(cm); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2134 return size; |
| 0 | 2135 } |
| 2136 | |
| 2137 #endif // SERIALGC | |
| 2138 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2139 void InstanceKlass::clean_implementors_list(BoolObjectClosure* is_alive) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2140 assert(is_loader_alive(is_alive), "this klass should be live"); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2141 if (is_interface()) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2142 if (ClassUnloading) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2143 Klass* impl = implementor(); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2144 if (impl != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2145 if (!impl->is_loader_alive(is_alive)) { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2146 // remove this guy |
|
6038
8bafad97cd26
7158552: The instanceKlsss::_host_klass is only needed for anonymous class for JSR 292 support.
jiangli
parents:
5998
diff
changeset
|
2147 *adr_implementor() = NULL; |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2148 } |
| 0 | 2149 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2150 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2151 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2152 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2153 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2154 void InstanceKlass::clean_method_data(BoolObjectClosure* is_alive) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2155 #ifdef COMPILER2 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2156 // Currently only used by C2. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2157 for (int m = 0; m < methods()->length(); m++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2158 MethodData* mdo = methods()->at(m)->method_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2159 if (mdo != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2160 for (ProfileData* data = mdo->first_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2161 mdo->is_valid(data); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2162 data = mdo->next_data(data)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2163 data->clean_weak_klass_links(is_alive); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2164 } |
| 0 | 2165 } |
| 2166 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2167 #else |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2168 #ifdef ASSERT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2169 // Verify that we haven't started to use MDOs for C1. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2170 for (int m = 0; m < methods()->length(); m++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2171 MethodData* mdo = methods()->at(m)->method_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2172 assert(mdo == NULL, "Didn't expect C1 to use MDOs"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2173 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2174 #endif // ASSERT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2175 #endif // !COMPILER2 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2176 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2177 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2178 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2179 static void remove_unshareable_in_class(Klass* k) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2180 // remove klass's unshareable info |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2181 k->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2182 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2183 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2184 void InstanceKlass::remove_unshareable_info() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2185 Klass::remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2186 // Unlink the class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2187 if (is_linked()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2188 unlink_class(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2189 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2190 init_implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2191 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2192 constants()->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2193 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2194 for (int i = 0; i < methods()->length(); i++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2195 Method* m = methods()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2196 m->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2197 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2198 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2199 // Need to reinstate when reading back the class. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2200 set_init_lock(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2201 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2202 // do array classes also. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2203 array_klasses_do(remove_unshareable_in_class); |
| 0 | 2204 } |
| 2205 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2206 void restore_unshareable_in_class(Klass* k, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2207 k->restore_unshareable_info(CHECK); |
| 0 | 2208 } |
| 2209 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2210 void InstanceKlass::restore_unshareable_info(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2211 Klass::restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2212 instanceKlassHandle ik(THREAD, this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2213 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2214 Array<Method*>* methods = ik->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2215 int num_methods = methods->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2216 for (int index2 = 0; index2 < num_methods; ++index2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2217 methodHandle m(THREAD, methods->at(index2)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2218 m()->link_method(m, CHECK); |
|
6733
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
2219 // restore method's vtable by calling a virtual function |
|
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
2220 m->restore_vtable(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2221 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2222 if (JvmtiExport::has_redefined_a_class()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2223 // Reinitialize vtable because RedefineClasses may have changed some |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2224 // entries in this vtable for super classes so the CDS vtable might |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2225 // point to old or obsolete entries. RedefineClasses doesn't fix up |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2226 // vtables in the shared system dictionary, only the main one. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2227 // It also redefines the itable too so fix that too. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2228 ResourceMark rm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2229 ik->vtable()->initialize_vtable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2230 ik->itable()->initialize_itable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2231 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2232 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2233 // Allocate a simple java object for a lock. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2234 // This needs to be a java object because during class initialization |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2235 // it can be held across a java call. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2236 typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2237 Handle h(THREAD, (oop)r); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2238 ik->set_init_lock(h()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2239 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2240 // restore constant pool resolved references |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2241 ik->constants()->restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2242 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2243 ik->array_klasses_do(restore_unshareable_in_class, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2244 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2245 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2246 static void clear_all_breakpoints(Method* m) { |
| 0 | 2247 m->clear_all_breakpoints(); |
| 2248 } | |
| 2249 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2250 void InstanceKlass::release_C_heap_structures() { |
| 0 | 2251 // Deallocate oop map cache |
| 2252 if (_oop_map_cache != NULL) { | |
| 2253 delete _oop_map_cache; | |
| 2254 _oop_map_cache = NULL; | |
| 2255 } | |
| 2256 | |
| 2257 // Deallocate JNI identifiers for jfieldIDs | |
| 2258 JNIid::deallocate(jni_ids()); | |
| 2259 set_jni_ids(NULL); | |
| 2260 | |
| 2261 jmethodID* jmeths = methods_jmethod_ids_acquire(); | |
| 2262 if (jmeths != (jmethodID*)NULL) { | |
| 2263 release_set_methods_jmethod_ids(NULL); | |
| 2264 FreeHeap(jmeths); | |
| 2265 } | |
| 2266 | |
| 2267 int* indices = methods_cached_itable_indices_acquire(); | |
| 2268 if (indices != (int*)NULL) { | |
| 2269 release_set_methods_cached_itable_indices(NULL); | |
| 2270 FreeHeap(indices); | |
| 2271 } | |
| 2272 | |
| 2273 // release dependencies | |
| 2274 nmethodBucket* b = _dependencies; | |
| 2275 _dependencies = NULL; | |
| 2276 while (b != NULL) { | |
| 2277 nmethodBucket* next = b->next(); | |
| 2278 delete b; | |
| 2279 b = next; | |
| 2280 } | |
| 2281 | |
| 2282 // Deallocate breakpoint records | |
| 2283 if (breakpoints() != 0x0) { | |
| 2284 methods_do(clear_all_breakpoints); | |
| 2285 assert(breakpoints() == 0x0, "should have cleared breakpoints"); | |
| 2286 } | |
| 2287 | |
| 2288 // deallocate information about previous versions | |
| 2289 if (_previous_versions != NULL) { | |
| 2290 for (int i = _previous_versions->length() - 1; i >= 0; i--) { | |
| 2291 PreviousVersionNode * pv_node = _previous_versions->at(i); | |
| 2292 delete pv_node; | |
| 2293 } | |
| 2294 delete _previous_versions; | |
| 2295 _previous_versions = NULL; | |
| 2296 } | |
| 2297 | |
| 2298 // deallocate the cached class file | |
| 2299 if (_cached_class_file_bytes != NULL) { | |
| 6197 | 2300 os::free(_cached_class_file_bytes, mtClass); |
| 0 | 2301 _cached_class_file_bytes = NULL; |
| 2302 _cached_class_file_len = 0; | |
| 2303 } | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2304 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2305 // Decrement symbol reference counts associated with the unloaded class. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2306 if (_name != NULL) _name->decrement_refcount(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2307 // unreference array name derived from this class name (arrays of an unloaded |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2308 // class can't be referenced anymore). |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2309 if (_array_name != NULL) _array_name->decrement_refcount(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2310 if (_source_file_name != NULL) _source_file_name->decrement_refcount(); |
|
6203
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2311 if (_source_debug_extension != NULL) FREE_C_HEAP_ARRAY(char, _source_debug_extension, mtClass); |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2312 |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2313 assert(_total_instanceKlass_count >= 1, "Sanity check"); |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2314 Atomic::dec(&_total_instanceKlass_count); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2315 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2316 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2317 void InstanceKlass::set_source_file_name(Symbol* n) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2318 _source_file_name = n; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2319 if (_source_file_name != NULL) _source_file_name->increment_refcount(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2320 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2321 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2322 void InstanceKlass::set_source_debug_extension(char* array, int length) { |
|
6203
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2323 if (array == NULL) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2324 _source_debug_extension = NULL; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2325 } else { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2326 // Adding one to the attribute length in order to store a null terminator |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2327 // character could cause an overflow because the attribute length is |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2328 // already coded with an u4 in the classfile, but in practice, it's |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2329 // unlikely to happen. |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2330 assert((length+1) > length, "Overflow checking"); |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2331 char* sde = NEW_C_HEAP_ARRAY(char, (length + 1), mtClass); |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2332 for (int i = 0; i < length; i++) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2333 sde[i] = array[i]; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2334 } |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2335 sde[length] = '\0'; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2336 _source_debug_extension = sde; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2337 } |
| 0 | 2338 } |
| 2339 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2340 address InstanceKlass::static_field_addr(int offset) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
2341 return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + (intptr_t)java_mirror()); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2342 } |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2343 |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2344 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2345 const char* InstanceKlass::signature_name() const { |
| 0 | 2346 const char* src = (const char*) (name()->as_C_string()); |
| 2347 const int src_length = (int)strlen(src); | |
| 2348 char* dest = NEW_RESOURCE_ARRAY(char, src_length + 3); | |
| 2349 int src_index = 0; | |
| 2350 int dest_index = 0; | |
| 2351 dest[dest_index++] = 'L'; | |
| 2352 while (src_index < src_length) { | |
| 2353 dest[dest_index++] = src[src_index++]; | |
| 2354 } | |
| 2355 dest[dest_index++] = ';'; | |
| 2356 dest[dest_index] = '\0'; | |
| 2357 return dest; | |
| 2358 } | |
| 2359 | |
| 2360 // different verisons of is_same_class_package | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2361 bool InstanceKlass::is_same_class_package(Klass* class2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2362 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2363 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2364 Symbol* classname1 = class1->name(); |
| 2365 | |
| 2366 if (class2->oop_is_objArray()) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2367 class2 = ObjArrayKlass::cast(class2)->bottom_klass(); |
| 0 | 2368 } |
| 2369 oop classloader2; | |
| 6983 | 2370 if (class2->oop_is_instance()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2371 classloader2 = InstanceKlass::cast(class2)->class_loader(); |
| 0 | 2372 } else { |
| 6983 | 2373 assert(class2->oop_is_typeArray(), "should be type array"); |
| 0 | 2374 classloader2 = NULL; |
| 2375 } | |
| 6983 | 2376 Symbol* classname2 = class2->name(); |
| 0 | 2377 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2378 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2379 classloader2, classname2); |
| 2380 } | |
| 2381 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2382 bool InstanceKlass::is_same_class_package(oop classloader2, Symbol* classname2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2383 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2384 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2385 Symbol* classname1 = class1->name(); |
| 0 | 2386 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2387 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2388 classloader2, classname2); |
| 2389 } | |
| 2390 | |
| 2391 // return true if two classes are in the same package, classloader | |
| 2392 // and classname information is enough to determine a class's package | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2393 bool InstanceKlass::is_same_class_package(oop class_loader1, Symbol* class_name1, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2394 oop class_loader2, Symbol* class_name2) { |
| 0 | 2395 if (class_loader1 != class_loader2) { |
| 2396 return false; | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2397 } else if (class_name1 == class_name2) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2398 return true; // skip painful bytewise comparison |
| 0 | 2399 } else { |
| 2400 ResourceMark rm; | |
| 2401 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2402 // The Symbol*'s are in UTF8 encoding. Since we only need to check explicitly |
| 0 | 2403 // for ASCII characters ('/', 'L', '['), we can keep them in UTF8 encoding. |
| 2404 // Otherwise, we just compare jbyte values between the strings. | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2405 const jbyte *name1 = class_name1->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2406 const jbyte *name2 = class_name2->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2407 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2408 const jbyte *last_slash1 = UTF8::strrchr(name1, class_name1->utf8_length(), '/'); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2409 const jbyte *last_slash2 = UTF8::strrchr(name2, class_name2->utf8_length(), '/'); |
| 0 | 2410 |
| 2411 if ((last_slash1 == NULL) || (last_slash2 == NULL)) { | |
| 2412 // One of the two doesn't have a package. Only return true | |
| 2413 // if the other one also doesn't have a package. | |
| 2414 return last_slash1 == last_slash2; | |
| 2415 } else { | |
| 2416 // Skip over '['s | |
| 2417 if (*name1 == '[') { | |
| 2418 do { | |
| 2419 name1++; | |
| 2420 } while (*name1 == '['); | |
| 2421 if (*name1 != 'L') { | |
| 2422 // Something is terribly wrong. Shouldn't be here. | |
| 2423 return false; | |
| 2424 } | |
| 2425 } | |
| 2426 if (*name2 == '[') { | |
| 2427 do { | |
| 2428 name2++; | |
| 2429 } while (*name2 == '['); | |
| 2430 if (*name2 != 'L') { | |
| 2431 // Something is terribly wrong. Shouldn't be here. | |
| 2432 return false; | |
| 2433 } | |
| 2434 } | |
| 2435 | |
| 2436 // Check that package part is identical | |
| 2437 int length1 = last_slash1 - name1; | |
| 2438 int length2 = last_slash2 - name2; | |
| 2439 | |
| 2440 return UTF8::equal(name1, length1, name2, length2); | |
| 2441 } | |
| 2442 } | |
| 2443 } | |
| 2444 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2445 // Returns true iff super_method can be overridden by a method in targetclassname |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2446 // See JSL 3rd edition 8.4.6.1 |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2447 // Assumes name-signature match |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2448 // "this" is InstanceKlass of super_method which must exist |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2449 // note that the InstanceKlass of the method in the targetclassname has not always been created yet |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2450 bool InstanceKlass::is_override(methodHandle super_method, Handle targetclassloader, Symbol* targetclassname, TRAPS) { |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2451 // Private methods can not be overridden |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2452 if (super_method->is_private()) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2453 return false; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2454 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2455 // If super method is accessible, then override |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2456 if ((super_method->is_protected()) || |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2457 (super_method->is_public())) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2458 return true; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2459 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2460 // Package-private methods are not inherited outside of package |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2461 assert(super_method->is_package_private(), "must be package private"); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2462 return(is_same_class_package(targetclassloader(), targetclassname)); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2463 } |
| 0 | 2464 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2465 /* defined for now in jvm.cpp, for historical reasons *-- |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2466 Klass* InstanceKlass::compute_enclosing_class_impl(instanceKlassHandle self, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2467 Symbol*& simple_name_result, TRAPS) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2468 ... |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2469 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2470 */ |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2471 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2472 // tell if two classes have the same enclosing class (at package level) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2473 bool InstanceKlass::is_same_package_member_impl(instanceKlassHandle class1, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2474 Klass* class2_oop, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2475 if (class2_oop == class1()) return true; |
| 6983 | 2476 if (!class2_oop->oop_is_instance()) return false; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2477 instanceKlassHandle class2(THREAD, class2_oop); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2478 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2479 // must be in same package before we try anything else |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2480 if (!class1->is_same_class_package(class2->class_loader(), class2->name())) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2481 return false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2482 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2483 // As long as there is an outer1.getEnclosingClass, |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2484 // shift the search outward. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2485 instanceKlassHandle outer1 = class1; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2486 for (;;) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2487 // As we walk along, look for equalities between outer1 and class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2488 // Eventually, the walks will terminate as outer1 stops |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2489 // at the top-level class around the original class. |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2490 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2491 Klass* next = outer1->compute_enclosing_class(&ignore_inner_is_member, |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2492 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2493 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2494 if (next == class2()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2495 outer1 = instanceKlassHandle(THREAD, next); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2496 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2497 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2498 // Now do the same for class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2499 instanceKlassHandle outer2 = class2; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2500 for (;;) { |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2501 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2502 Klass* next = outer2->compute_enclosing_class(&ignore_inner_is_member, |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2503 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2504 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2505 // Might as well check the new outer against all available values. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2506 if (next == class1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2507 if (next == outer1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2508 outer2 = instanceKlassHandle(THREAD, next); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2509 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2510 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2511 // If by this point we have not found an equality between the |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2512 // two classes, we know they are in separate package members. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2513 return false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2514 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2515 |
| 0 | 2516 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2517 jint InstanceKlass::compute_modifier_flags(TRAPS) const { |
| 0 | 2518 jint access = access_flags().as_int(); |
| 2519 | |
| 2520 // But check if it happens to be member class. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2521 instanceKlassHandle ik(THREAD, this); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2522 InnerClassesIterator iter(ik); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2523 for (; !iter.done(); iter.next()) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2524 int ioff = iter.inner_class_info_index(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2525 // Inner class attribute can be zero, skip it. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2526 // Strange but true: JVM spec. allows null inner class refs. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2527 if (ioff == 0) continue; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2528 |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2529 // only look at classes that are already loaded |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2530 // since we are looking for the flags for our self. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2531 Symbol* inner_name = ik->constants()->klass_name_at(ioff); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2532 if ((ik->name() == inner_name)) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2533 // This is really a member class. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2534 access = iter.inner_access_flags(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2535 break; |
| 0 | 2536 } |
| 2537 } | |
| 2538 // Remember to strip ACC_SUPER bit | |
| 2539 return (access & (~JVM_ACC_SUPER)) & JVM_ACC_WRITTEN_FLAGS; | |
| 2540 } | |
| 2541 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2542 jint InstanceKlass::jvmti_class_status() const { |
| 0 | 2543 jint result = 0; |
| 2544 | |
| 2545 if (is_linked()) { | |
| 2546 result |= JVMTI_CLASS_STATUS_VERIFIED | JVMTI_CLASS_STATUS_PREPARED; | |
| 2547 } | |
| 2548 | |
| 2549 if (is_initialized()) { | |
| 2550 assert(is_linked(), "Class status is not consistent"); | |
| 2551 result |= JVMTI_CLASS_STATUS_INITIALIZED; | |
| 2552 } | |
| 2553 if (is_in_error_state()) { | |
| 2554 result |= JVMTI_CLASS_STATUS_ERROR; | |
| 2555 } | |
| 2556 return result; | |
| 2557 } | |
| 2558 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2559 Method* InstanceKlass::method_at_itable(Klass* holder, int index, TRAPS) { |
| 0 | 2560 itableOffsetEntry* ioe = (itableOffsetEntry*)start_of_itable(); |
| 2561 int method_table_offset_in_words = ioe->offset()/wordSize; | |
| 2562 int nof_interfaces = (method_table_offset_in_words - itable_offset_in_words()) | |
| 2563 / itableOffsetEntry::size(); | |
| 2564 | |
| 2565 for (int cnt = 0 ; ; cnt ++, ioe ++) { | |
| 605 | 2566 // If the interface isn't implemented by the receiver class, |
| 0 | 2567 // the VM should throw IncompatibleClassChangeError. |
| 2568 if (cnt >= nof_interfaces) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2569 THROW_NULL(vmSymbols::java_lang_IncompatibleClassChangeError()); |
| 0 | 2570 } |
| 2571 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2572 Klass* ik = ioe->interface_klass(); |
| 0 | 2573 if (ik == holder) break; |
| 2574 } | |
| 2575 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2576 itableMethodEntry* ime = ioe->first_method_entry(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2577 Method* m = ime[index].method(); |
| 0 | 2578 if (m == NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2579 THROW_NULL(vmSymbols::java_lang_AbstractMethodError()); |
| 0 | 2580 } |
| 2581 return m; | |
| 2582 } | |
| 2583 | |
| 2584 // On-stack replacement stuff | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2585 void InstanceKlass::add_osr_nmethod(nmethod* n) { |
| 0 | 2586 // only one compilation can be active |
| 2587 NEEDS_CLEANUP | |
| 2588 // This is a short non-blocking critical region, so the no safepoint check is ok. | |
| 2589 OsrList_lock->lock_without_safepoint_check(); | |
| 2590 assert(n->is_osr_method(), "wrong kind of nmethod"); | |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2591 n->set_osr_link(osr_nmethods_head()); |
| 0 | 2592 set_osr_nmethods_head(n); |
| 1783 | 2593 // Raise the highest osr level if necessary |
| 2594 if (TieredCompilation) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2595 Method* m = n->method(); |
| 1783 | 2596 m->set_highest_osr_comp_level(MAX2(m->highest_osr_comp_level(), n->comp_level())); |
| 2597 } | |
| 0 | 2598 // Remember to unlock again |
| 2599 OsrList_lock->unlock(); | |
| 1783 | 2600 |
| 2601 // Get rid of the osr methods for the same bci that have lower levels. | |
| 2602 if (TieredCompilation) { | |
| 2603 for (int l = CompLevel_limited_profile; l < n->comp_level(); l++) { | |
| 2604 nmethod *inv = lookup_osr_nmethod(n->method(), n->osr_entry_bci(), l, true); | |
| 2605 if (inv != NULL && inv->is_in_use()) { | |
| 2606 inv->make_not_entrant(); | |
| 2607 } | |
| 2608 } | |
| 2609 } | |
| 0 | 2610 } |
| 2611 | |
| 2612 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2613 void InstanceKlass::remove_osr_nmethod(nmethod* n) { |
| 0 | 2614 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2615 OsrList_lock->lock_without_safepoint_check(); | |
| 2616 assert(n->is_osr_method(), "wrong kind of nmethod"); | |
| 2617 nmethod* last = NULL; | |
| 2618 nmethod* cur = osr_nmethods_head(); | |
| 1783 | 2619 int max_level = CompLevel_none; // Find the max comp level excluding n |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2620 Method* m = n->method(); |
| 0 | 2621 // Search for match |
| 2622 while(cur != NULL && cur != n) { | |
| 1783 | 2623 if (TieredCompilation) { |
| 2624 // Find max level before n | |
| 2625 max_level = MAX2(max_level, cur->comp_level()); | |
| 2626 } | |
| 0 | 2627 last = cur; |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2628 cur = cur->osr_link(); |
| 0 | 2629 } |
| 1783 | 2630 nmethod* next = NULL; |
| 0 | 2631 if (cur == n) { |
| 1783 | 2632 next = cur->osr_link(); |
| 0 | 2633 if (last == NULL) { |
| 2634 // Remove first element | |
| 1783 | 2635 set_osr_nmethods_head(next); |
| 0 | 2636 } else { |
| 1783 | 2637 last->set_osr_link(next); |
| 0 | 2638 } |
| 2639 } | |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2640 n->set_osr_link(NULL); |
| 1783 | 2641 if (TieredCompilation) { |
| 2642 cur = next; | |
| 2643 while (cur != NULL) { | |
| 2644 // Find max level after n | |
| 2645 max_level = MAX2(max_level, cur->comp_level()); | |
| 2646 cur = cur->osr_link(); | |
| 2647 } | |
| 2648 m->set_highest_osr_comp_level(max_level); | |
| 2649 } | |
| 0 | 2650 // Remember to unlock again |
| 2651 OsrList_lock->unlock(); | |
| 2652 } | |
| 2653 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2654 nmethod* InstanceKlass::lookup_osr_nmethod(Method* const m, int bci, int comp_level, bool match_level) const { |
| 0 | 2655 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2656 OsrList_lock->lock_without_safepoint_check(); | |
| 2657 nmethod* osr = osr_nmethods_head(); | |
| 1783 | 2658 nmethod* best = NULL; |
| 0 | 2659 while (osr != NULL) { |
| 2660 assert(osr->is_osr_method(), "wrong kind of nmethod found in chain"); | |
| 1783 | 2661 // There can be a time when a c1 osr method exists but we are waiting |
| 2662 // for a c2 version. When c2 completes its osr nmethod we will trash | |
| 2663 // the c1 version and only be able to find the c2 version. However | |
| 2664 // while we overflow in the c1 code at back branches we don't want to | |
| 2665 // try and switch to the same code as we are already running | |
| 2666 | |
| 0 | 2667 if (osr->method() == m && |
| 2668 (bci == InvocationEntryBci || osr->osr_entry_bci() == bci)) { | |
| 1783 | 2669 if (match_level) { |
| 2670 if (osr->comp_level() == comp_level) { | |
| 2671 // Found a match - return it. | |
| 2672 OsrList_lock->unlock(); | |
| 2673 return osr; | |
| 2674 } | |
| 2675 } else { | |
| 2676 if (best == NULL || (osr->comp_level() > best->comp_level())) { | |
| 2677 if (osr->comp_level() == CompLevel_highest_tier) { | |
| 2678 // Found the best possible - return it. | |
| 2679 OsrList_lock->unlock(); | |
| 2680 return osr; | |
| 2681 } | |
| 2682 best = osr; | |
| 2683 } | |
| 2684 } | |
| 0 | 2685 } |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2686 osr = osr->osr_link(); |
| 0 | 2687 } |
| 2688 OsrList_lock->unlock(); | |
| 1783 | 2689 if (best != NULL && best->comp_level() >= comp_level && match_level == false) { |
| 2690 return best; | |
| 2691 } | |
| 0 | 2692 return NULL; |
| 2693 } | |
| 2694 | |
| 2695 // ----------------------------------------------------------------------------------------------------- | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2696 // Printing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2697 |
| 0 | 2698 #ifndef PRODUCT |
| 2699 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2700 #define BULLET " - " |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2701 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2702 static const char* state_names[] = { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2703 "allocated", "loaded", "linked", "being_initialized", "fully_initialized", "initialization_error" |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2704 }; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2705 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2706 void InstanceKlass::print_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2707 assert(is_klass(), "must be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2708 Klass::print_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2709 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2710 st->print(BULLET"instance size: %d", size_helper()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2711 st->print(BULLET"klass size: %d", size()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2712 st->print(BULLET"access: "); access_flags().print_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2713 st->print(BULLET"state: "); st->print_cr(state_names[_init_state]); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2714 st->print(BULLET"name: "); name()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2715 st->print(BULLET"super: "); super()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2716 st->print(BULLET"sub: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2717 Klass* sub = subklass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2718 int n; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2719 for (n = 0; sub != NULL; n++, sub = sub->next_sibling()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2720 if (n < MaxSubklassPrintSize) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2721 sub->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2722 st->print(" "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2723 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2724 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2725 if (n >= MaxSubklassPrintSize) st->print("(%d more klasses...)", n - MaxSubklassPrintSize); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2726 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2727 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2728 if (is_interface()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2729 st->print_cr(BULLET"nof implementors: %d", nof_implementors()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2730 if (nof_implementors() == 1) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2731 st->print_cr(BULLET"implementor: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2732 st->print(" "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2733 implementor()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2734 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2735 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2736 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2737 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2738 st->print(BULLET"arrays: "); array_klasses()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2739 st->print(BULLET"methods: "); methods()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2740 if (Verbose) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2741 Array<Method*>* method_array = methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2742 for(int i = 0; i < method_array->length(); i++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2743 st->print("%d : ", i); method_array->at(i)->print_value(); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2744 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2745 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2746 st->print(BULLET"method ordering: "); method_ordering()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2747 st->print(BULLET"local interfaces: "); local_interfaces()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2748 st->print(BULLET"trans. interfaces: "); transitive_interfaces()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2749 st->print(BULLET"constants: "); constants()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2750 if (class_loader_data() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2751 st->print(BULLET"class loader data: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2752 class_loader_data()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2753 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2754 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2755 st->print(BULLET"protection domain: "); ((InstanceKlass*)this)->protection_domain()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2756 st->print(BULLET"host class: "); host_klass()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2757 st->print(BULLET"signers: "); signers()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2758 st->print(BULLET"init_lock: "); ((oop)init_lock())->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2759 if (source_file_name() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2760 st->print(BULLET"source file: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2761 source_file_name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2762 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2763 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2764 if (source_debug_extension() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2765 st->print(BULLET"source debug extension: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2766 st->print("%s", source_debug_extension()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2767 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2768 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2769 st->print(BULLET"annotations: "); annotations()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2770 { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2771 ResourceMark rm; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2772 // PreviousVersionInfo objects returned via PreviousVersionWalker |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2773 // contain a GrowableArray of handles. We have to clean up the |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2774 // GrowableArray _after_ the PreviousVersionWalker destructor |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2775 // has destroyed the handles. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2776 { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2777 bool have_pv = false; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2778 PreviousVersionWalker pvw((InstanceKlass*)this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2779 for (PreviousVersionInfo * pv_info = pvw.next_previous_version(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2780 pv_info != NULL; pv_info = pvw.next_previous_version()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2781 if (!have_pv) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2782 st->print(BULLET"previous version: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2783 have_pv = true; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2784 pv_info->prev_constant_pool_handle()()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2785 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2786 if (have_pv) st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2787 } // pvw is cleaned up |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2788 } // rm is cleaned up |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2789 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2790 if (generic_signature() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2791 st->print(BULLET"generic signature: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2792 generic_signature()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2793 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2794 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2795 st->print(BULLET"inner classes: "); inner_classes()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2796 st->print(BULLET"java mirror: "); java_mirror()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2797 st->print(BULLET"vtable length %d (start addr: " INTPTR_FORMAT ")", vtable_length(), start_of_vtable()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2798 st->print(BULLET"itable length %d (start addr: " INTPTR_FORMAT ")", itable_length(), start_of_itable()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2799 st->print_cr(BULLET"---- static fields (%d words):", static_field_size()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2800 FieldPrinter print_static_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2801 ((InstanceKlass*)this)->do_local_static_fields(&print_static_field); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2802 st->print_cr(BULLET"---- non-static fields (%d words):", nonstatic_field_size()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2803 FieldPrinter print_nonstatic_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2804 ((InstanceKlass*)this)->do_nonstatic_fields(&print_nonstatic_field); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2805 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2806 st->print(BULLET"non-static oop maps: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2807 OopMapBlock* map = start_of_nonstatic_oop_maps(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2808 OopMapBlock* end_map = map + nonstatic_oop_map_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2809 while (map < end_map) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2810 st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->count() - 1)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2811 map++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2812 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2813 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2814 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2815 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2816 #endif //PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2817 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2818 void InstanceKlass::print_value_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2819 assert(is_klass(), "must be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2820 name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2821 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2822 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2823 #ifndef PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2824 |
| 0 | 2825 void FieldPrinter::do_field(fieldDescriptor* fd) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2826 _st->print(BULLET); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2827 if (_obj == NULL) { |
| 0 | 2828 fd->print_on(_st); |
| 2829 _st->cr(); | |
| 2830 } else { | |
| 2831 fd->print_on_for(_st, _obj); | |
| 2832 _st->cr(); | |
| 2833 } | |
| 2834 } | |
| 2835 | |
| 2836 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2837 void InstanceKlass::oop_print_on(oop obj, outputStream* st) { |
| 0 | 2838 Klass::oop_print_on(obj, st); |
| 2839 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2840 if (this == SystemDictionary::String_klass()) { |
| 0 | 2841 typeArrayOop value = java_lang_String::value(obj); |
| 2842 juint offset = java_lang_String::offset(obj); | |
| 2843 juint length = java_lang_String::length(obj); | |
| 2844 if (value != NULL && | |
| 2845 value->is_typeArray() && | |
| 2846 offset <= (juint) value->length() && | |
| 2847 offset + length <= (juint) value->length()) { | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2848 st->print(BULLET"string: "); |
| 0 | 2849 Handle h_obj(obj); |
| 2850 java_lang_String::print(h_obj, st); | |
| 2851 st->cr(); | |
| 2852 if (!WizardMode) return; // that is enough | |
| 2853 } | |
| 2854 } | |
| 2855 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2856 st->print_cr(BULLET"---- fields (total size %d words):", oop_size(obj)); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2857 FieldPrinter print_field(st, obj); |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2858 do_nonstatic_fields(&print_field); |
| 0 | 2859 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2860 if (this == SystemDictionary::Class_klass()) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2861 st->print(BULLET"signature: "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2862 java_lang_Class::print_signature(obj, st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2863 st->cr(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2864 Klass* mirrored_klass = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2865 st->print(BULLET"fake entry for mirror: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2866 mirrored_klass->print_value_on_maybe_null(st); |
| 0 | 2867 st->cr(); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2868 st->print(BULLET"fake entry resolved_constructor: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2869 Method* ctor = java_lang_Class::resolved_constructor(obj); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2870 ctor->print_value_on_maybe_null(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2871 Klass* array_klass = java_lang_Class::array_klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2872 st->cr(); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2873 st->print(BULLET"fake entry for array: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2874 array_klass->print_value_on_maybe_null(st); |
| 0 | 2875 st->cr(); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2876 st->print_cr(BULLET"fake entry for oop_size: %d", java_lang_Class::oop_size(obj)); |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2877 st->print_cr(BULLET"fake entry for static_oop_field_count: %d", java_lang_Class::static_oop_field_count(obj)); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2878 Klass* real_klass = java_lang_Class::as_Klass(obj); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2879 if (real_klass != NULL && real_klass->oop_is_instance()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2880 InstanceKlass::cast(real_klass)->do_local_static_fields(&print_field); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2881 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2882 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
2883 st->print(BULLET"signature: "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
2884 java_lang_invoke_MethodType::print_signature(obj, st); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
2885 st->cr(); |
| 0 | 2886 } |
| 2887 } | |
| 2888 | |
|
1155
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
2889 #endif //PRODUCT |
|
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
2890 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2891 void InstanceKlass::oop_print_value_on(oop obj, outputStream* st) { |
| 0 | 2892 st->print("a "); |
| 2893 name()->print_value_on(st); | |
| 2894 obj->print_address_on(st); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2895 if (this == SystemDictionary::String_klass() |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2896 && java_lang_String::value(obj) != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2897 ResourceMark rm; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2898 int len = java_lang_String::length(obj); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2899 int plen = (len < 24 ? len : 12); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2900 char* str = java_lang_String::as_utf8_string(obj, 0, plen); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2901 st->print(" = \"%s\"", str); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2902 if (len > plen) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2903 st->print("...[%d]", len); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2904 } else if (this == SystemDictionary::Class_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2905 Klass* k = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2906 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2907 if (k != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2908 k->print_value_on(st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2909 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2910 const char* tname = type2name(java_lang_Class::primitive_type(obj)); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2911 st->print("%s", tname ? tname : "type?"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2912 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2913 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
2914 st->print(" = "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
2915 java_lang_invoke_MethodType::print_signature(obj, st); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2916 } else if (java_lang_boxing_object::is_instance(obj)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2917 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2918 java_lang_boxing_object::print(obj, st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2919 } else if (this == SystemDictionary::LambdaForm_klass()) { |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2920 oop vmentry = java_lang_invoke_LambdaForm::vmentry(obj); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2921 if (vmentry != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2922 st->print(" => "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2923 vmentry->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2924 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2925 } else if (this == SystemDictionary::MemberName_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2926 Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(obj); |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2927 if (vmtarget != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2928 st->print(" = "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2929 vmtarget->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2930 } else { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2931 java_lang_invoke_MemberName::clazz(obj)->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2932 st->print("."); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2933 java_lang_invoke_MemberName::name(obj)->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
2934 } |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2935 } |
| 0 | 2936 } |
| 2937 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2938 const char* InstanceKlass::internal_name() const { |
| 0 | 2939 return external_name(); |
| 2940 } | |
| 2941 | |
| 2942 // Verification | |
| 2943 | |
| 2944 class VerifyFieldClosure: public OopClosure { | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2945 protected: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2946 template <class T> void do_oop_work(T* p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2947 oop obj = oopDesc::load_decode_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2948 if (!obj->is_oop_or_null()) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2949 tty->print_cr("Failed: " PTR_FORMAT " -> " PTR_FORMAT, p, (address)obj); |
| 0 | 2950 Universe::print(); |
| 2951 guarantee(false, "boom"); | |
| 2952 } | |
| 2953 } | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2954 public: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2955 virtual void do_oop(oop* p) { VerifyFieldClosure::do_oop_work(p); } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2956 virtual void do_oop(narrowOop* p) { VerifyFieldClosure::do_oop_work(p); } |
| 0 | 2957 }; |
| 2958 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2959 void InstanceKlass::verify_on(outputStream* st) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2960 Klass::verify_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2961 Thread *thread = Thread::current(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2962 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2963 #ifndef PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2964 // Avoid redundant verifies |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2965 if (_verify_count == Universe::verify_count()) return; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2966 _verify_count = Universe::verify_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2967 #endif |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2968 // Verify that klass is present in SystemDictionary |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2969 if (is_loaded() && !is_anonymous()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2970 Symbol* h_name = name(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2971 SystemDictionary::verify_obj_klass_present(h_name, class_loader_data()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2972 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2973 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2974 // Verify static fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2975 VerifyFieldClosure blk; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2976 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2977 // Verify vtables |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2978 if (is_linked()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2979 ResourceMark rm(thread); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2980 // $$$ This used to be done only for m/s collections. Doing it |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2981 // always seemed a valid generalization. (DLD -- 6/00) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2982 vtable()->verify(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2983 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2984 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2985 // Verify first subklass |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2986 if (subklass_oop() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2987 guarantee(subklass_oop()->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2988 guarantee(subklass_oop()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2989 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2990 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2991 // Verify siblings |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2992 Klass* super = this->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2993 Klass* sib = next_sibling(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2994 if (sib != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2995 if (sib == this) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2996 fatal(err_msg("subclass points to itself " PTR_FORMAT, sib)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2997 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2998 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2999 guarantee(sib->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3000 guarantee(sib->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3001 guarantee(sib->super() == super, "siblings should have same superklass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3002 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3003 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3004 // Verify implementor fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3005 Klass* im = implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3006 if (im != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3007 guarantee(is_interface(), "only interfaces should have implementor set"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3008 guarantee(im->is_klass(), "should be klass"); |
| 6983 | 3009 guarantee(!im->is_interface() || im == this, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3010 "implementors cannot be interfaces"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3011 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3012 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3013 // Verify local interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3014 if (local_interfaces()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3015 Array<Klass*>* local_interfaces = this->local_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3016 for (int j = 0; j < local_interfaces->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3017 Klass* e = local_interfaces->at(j); |
| 6983 | 3018 guarantee(e->is_klass() && e->is_interface(), "invalid local interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3019 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3020 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3021 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3022 // Verify transitive interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3023 if (transitive_interfaces() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3024 Array<Klass*>* transitive_interfaces = this->transitive_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3025 for (int j = 0; j < transitive_interfaces->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3026 Klass* e = transitive_interfaces->at(j); |
| 6983 | 3027 guarantee(e->is_klass() && e->is_interface(), "invalid transitive interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3028 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3029 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3030 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3031 // Verify methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3032 if (methods() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3033 Array<Method*>* methods = this->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3034 for (int j = 0; j < methods->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3035 guarantee(methods->at(j)->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3036 guarantee(methods->at(j)->is_method(), "non-method in methods array"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3037 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3038 for (int j = 0; j < methods->length() - 1; j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3039 Method* m1 = methods->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3040 Method* m2 = methods->at(j + 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3041 guarantee(m1->name()->fast_compare(m2->name()) <= 0, "methods not sorted correctly"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3042 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3043 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3044 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3045 // Verify method ordering |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3046 if (method_ordering() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3047 Array<int>* method_ordering = this->method_ordering(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3048 int length = method_ordering->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3049 if (JvmtiExport::can_maintain_original_method_order() || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3050 (UseSharedSpaces && length != 0)) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3051 guarantee(length == methods()->length(), "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3052 jlong sum = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3053 for (int j = 0; j < length; j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3054 int original_index = method_ordering->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3055 guarantee(original_index >= 0, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3056 guarantee(original_index < length, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3057 sum += original_index; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3058 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3059 // Verify sum of indices 0,1,...,length-1 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3060 guarantee(sum == ((jlong)length*(length-1))/2, "invalid method ordering sum"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3061 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3062 guarantee(length == 0, "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3063 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3064 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3065 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3066 // Verify JNI static field identifiers |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3067 if (jni_ids() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3068 jni_ids()->verify(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3069 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3070 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3071 // Verify other fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3072 if (array_klasses() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3073 guarantee(array_klasses()->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3074 guarantee(array_klasses()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3075 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3076 if (constants() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3077 guarantee(constants()->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3078 guarantee(constants()->is_constantPool(), "should be constant pool"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3079 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3080 if (protection_domain() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3081 guarantee(protection_domain()->is_oop(), "should be oop"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3082 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3083 if (host_klass() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3084 guarantee(host_klass()->is_metadata(), "should be in metaspace"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3085 guarantee(host_klass()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3086 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3087 if (signers() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3088 guarantee(signers()->is_objArray(), "should be obj array"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3089 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3090 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3091 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3092 void InstanceKlass::oop_verify_on(oop obj, outputStream* st) { |
| 0 | 3093 Klass::oop_verify_on(obj, st); |
| 3094 VerifyFieldClosure blk; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3095 obj->oop_iterate_no_header(&blk); |
| 0 | 3096 } |
| 3097 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3098 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3099 // JNIid class for jfieldIDs only |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3100 // Note to reviewers: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3101 // These JNI functions are just moved over to column 1 and not changed |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3102 // in the compressed oops workspace. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3103 JNIid::JNIid(Klass* holder, int offset, JNIid* next) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3104 _holder = holder; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3105 _offset = offset; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3106 _next = next; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3107 debug_only(_is_static_field_id = false;) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3108 } |
| 0 | 3109 |
| 3110 | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3111 JNIid* JNIid::find(int offset) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3112 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3113 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3114 if (current->offset() == offset) return current; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3115 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3116 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3117 return NULL; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3118 } |
| 0 | 3119 |
| 3120 void JNIid::deallocate(JNIid* current) { | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3121 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3122 JNIid* next = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3123 delete current; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3124 current = next; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3125 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3126 } |
| 0 | 3127 |
| 3128 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3129 void JNIid::verify(Klass* holder) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
3130 int first_field_offset = InstanceMirrorKlass::offset_of_static_fields(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3131 int end_field_offset; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3132 end_field_offset = first_field_offset + (InstanceKlass::cast(holder)->static_field_size() * wordSize); |
| 0 | 3133 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3134 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3135 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3136 guarantee(current->holder() == holder, "Invalid klass in JNIid"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3137 #ifdef ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3138 int o = current->offset(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3139 if (current->is_static_field_id()) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3140 guarantee(o >= first_field_offset && o < end_field_offset, "Invalid static field offset in JNIid"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3141 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3142 #endif |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3143 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3144 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3145 } |
| 0 | 3146 |
| 3147 | |
| 3148 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3149 void InstanceKlass::set_init_state(ClassState state) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3150 bool good_state = is_shared() ? (_init_state <= state) |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3151 : (_init_state < state); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3152 assert(good_state || state == allocated, "illegal state transition"); |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
3153 _init_state = (u1)state; |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3154 } |
| 0 | 3155 #endif |
| 3156 | |
| 3157 | |
| 3158 // RedefineClasses() support for previous versions: | |
| 3159 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3160 // Purge previous versions |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3161 static void purge_previous_versions_internal(InstanceKlass* ik, int emcp_method_count) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3162 if (ik->previous_versions() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3163 // This klass has previous versions so see what we can cleanup |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3164 // while it is safe to do so. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3165 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3166 int deleted_count = 0; // leave debugging breadcrumbs |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3167 int live_count = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3168 ClassLoaderData* loader_data = ik->class_loader_data() == NULL ? |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3169 ClassLoaderData::the_null_class_loader_data() : |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3170 ik->class_loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3171 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3172 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3173 RC_TRACE(0x00000200, ("purge: %s: previous version length=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3174 ik->external_name(), ik->previous_versions()->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3175 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3176 for (int i = ik->previous_versions()->length() - 1; i >= 0; i--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3177 // check the previous versions array |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3178 PreviousVersionNode * pv_node = ik->previous_versions()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3179 ConstantPool* cp_ref = pv_node->prev_constant_pool(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3180 assert(cp_ref != NULL, "cp ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3181 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3182 ConstantPool* pvcp = cp_ref; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3183 if (!pvcp->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3184 // If the constant pool isn't on stack, none of the methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3185 // are executing. Delete all the methods, the constant pool and |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3186 // and this previous version node. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3187 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3188 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3189 for (int j = method_refs->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3190 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3191 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3192 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3193 // method will be freed with associated class. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3194 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3195 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3196 // Remove the constant pool |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3197 delete pv_node; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3198 // Since we are traversing the array backwards, we don't have to |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3199 // do anything special with the index. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3200 ik->previous_versions()->remove_at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3201 deleted_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3202 continue; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3203 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3204 RC_TRACE(0x00000200, ("purge: previous version @%d is alive", i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3205 assert(pvcp->pool_holder() != NULL, "Constant pool with no holder"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3206 guarantee (!loader_data->is_unloading(), "unloaded classes can't be on the stack"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3207 live_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3208 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3209 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3210 // At least one method is live in this previous version, clean out |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3211 // the others or mark them as obsolete. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3212 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3213 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3214 RC_TRACE(0x00000200, ("purge: previous methods length=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3215 method_refs->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3216 for (int j = method_refs->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3217 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3218 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3219 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3220 // Remove the emcp method if it's not executing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3221 // If it's been made obsolete by a redefinition of a non-emcp |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3222 // method, mark it as obsolete but leave it to clean up later. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3223 if (!method->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3224 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3225 } else if (emcp_method_count == 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3226 method->set_is_obsolete(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3227 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3228 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3229 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3230 ("purge: %s(%s): prev method @%d in version @%d is alive", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3231 method->name()->as_C_string(), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3232 method->signature()->as_C_string(), j, i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3233 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3234 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3235 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3236 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3237 assert(ik->previous_versions()->length() == live_count, "sanity check"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3238 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3239 ("purge: previous version stats: live=%d, deleted=%d", live_count, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3240 deleted_count)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3241 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3242 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3243 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3244 // External interface for use during class unloading. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3245 void InstanceKlass::purge_previous_versions(InstanceKlass* ik) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3246 // Call with >0 emcp methods since they are not currently being redefined. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3247 purge_previous_versions_internal(ik, 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3248 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3249 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3250 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3251 // Potentially add an information node that contains pointers to the |
| 0 | 3252 // interesting parts of the previous version of the_class. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3253 // This is also where we clean out any unused references. |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3254 // Note that while we delete nodes from the _previous_versions |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3255 // array, we never delete the array itself until the klass is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3256 // unloaded. The has_been_redefined() query depends on that fact. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3257 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3258 void InstanceKlass::add_previous_version(instanceKlassHandle ikh, |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3259 BitMap* emcp_methods, int emcp_method_count) { |
| 0 | 3260 assert(Thread::current()->is_VM_thread(), |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3261 "only VMThread can add previous versions"); |
| 0 | 3262 |
| 3263 if (_previous_versions == NULL) { | |
| 3264 // This is the first previous version so make some space. | |
| 3265 // Start with 2 elements under the assumption that the class | |
| 3266 // won't be redefined much. | |
| 6197 | 3267 _previous_versions = new (ResourceObj::C_HEAP, mtClass) |
| 0 | 3268 GrowableArray<PreviousVersionNode *>(2, true); |
| 3269 } | |
| 3270 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3271 ConstantPool* cp_ref = ikh->constants(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3272 |
| 0 | 3273 // RC_TRACE macro has an embedded ResourceMark |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3274 RC_TRACE(0x00000400, ("adding previous version ref for %s @%d, EMCP_cnt=%d " |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3275 "on_stack=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3276 ikh->external_name(), _previous_versions->length(), emcp_method_count, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3277 cp_ref->on_stack())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3278 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3279 // If the constant pool for this previous version of the class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3280 // is not marked as being on the stack, then none of the methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3281 // in this previous version of the class are on the stack so |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3282 // we don't need to create a new PreviousVersionNode. However, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3283 // we still need to examine older previous versions below. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3284 Array<Method*>* old_methods = ikh->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3285 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3286 if (cp_ref->on_stack()) { |
| 0 | 3287 PreviousVersionNode * pv_node = NULL; |
| 3288 if (emcp_method_count == 0) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3289 // non-shared ConstantPool gets a reference |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3290 pv_node = new PreviousVersionNode(cp_ref, !cp_ref->is_shared(), NULL); |
| 0 | 3291 RC_TRACE(0x00000400, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3292 ("add: all methods are obsolete; flushing any EMCP refs")); |
| 0 | 3293 } else { |
| 3294 int local_count = 0; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3295 GrowableArray<Method*>* method_refs = new (ResourceObj::C_HEAP, mtClass) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3296 GrowableArray<Method*>(emcp_method_count, true); |
| 0 | 3297 for (int i = 0; i < old_methods->length(); i++) { |
| 3298 if (emcp_methods->at(i)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3299 // this old method is EMCP. Save it only if it's on the stack |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3300 Method* old_method = old_methods->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3301 if (old_method->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3302 method_refs->append(old_method); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3303 } |
| 0 | 3304 if (++local_count >= emcp_method_count) { |
| 3305 // no more EMCP methods so bail out now | |
| 3306 break; | |
| 3307 } | |
| 3308 } | |
| 3309 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3310 // non-shared ConstantPool gets a reference |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3311 pv_node = new PreviousVersionNode(cp_ref, !cp_ref->is_shared(), method_refs); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3312 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3313 // append new previous version. |
| 0 | 3314 _previous_versions->append(pv_node); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3315 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3316 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3317 // Since the caller is the VMThread and we are at a safepoint, this |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3318 // is a good time to clear out unused references. |
| 0 | 3319 |
| 3320 RC_TRACE(0x00000400, ("add: previous version length=%d", | |
| 3321 _previous_versions->length())); | |
| 3322 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3323 // Purge previous versions not executing on the stack |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3324 purge_previous_versions_internal(this, emcp_method_count); |
| 0 | 3325 |
| 3326 int obsolete_method_count = old_methods->length() - emcp_method_count; | |
| 3327 | |
| 3328 if (emcp_method_count != 0 && obsolete_method_count != 0 && | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3329 _previous_versions->length() > 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3330 // We have a mix of obsolete and EMCP methods so we have to |
| 0 | 3331 // clear out any matching EMCP method entries the hard way. |
| 3332 int local_count = 0; | |
| 3333 for (int i = 0; i < old_methods->length(); i++) { | |
| 3334 if (!emcp_methods->at(i)) { | |
| 3335 // only obsolete methods are interesting | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3336 Method* old_method = old_methods->at(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3337 Symbol* m_name = old_method->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3338 Symbol* m_signature = old_method->signature(); |
| 0 | 3339 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3340 // we might not have added the last entry |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3341 for (int j = _previous_versions->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3342 // check the previous versions array for non executing obsolete methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3343 PreviousVersionNode * pv_node = _previous_versions->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3344 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3345 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
| 0 | 3346 if (method_refs == NULL) { |
| 3347 // We have run into a PreviousVersion generation where | |
| 3348 // all methods were made obsolete during that generation's | |
| 3349 // RedefineClasses() operation. At the time of that | |
| 3350 // operation, all EMCP methods were flushed so we don't | |
| 3351 // have to go back any further. | |
| 3352 // | |
| 3353 // A NULL method_refs is different than an empty method_refs. | |
| 3354 // We cannot infer any optimizations about older generations | |
| 3355 // from an empty method_refs for the current generation. | |
| 3356 break; | |
| 3357 } | |
| 3358 | |
| 3359 for (int k = method_refs->length() - 1; k >= 0; k--) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3360 Method* method = method_refs->at(k); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3361 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3362 if (!method->is_obsolete() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3363 method->name() == m_name && |
| 0 | 3364 method->signature() == m_signature) { |
| 3365 // The current RedefineClasses() call has made all EMCP | |
| 3366 // versions of this method obsolete so mark it as obsolete | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3367 // and remove the reference. |
| 0 | 3368 RC_TRACE(0x00000400, |
| 3369 ("add: %s(%s): flush obsolete method @%d in version @%d", | |
| 3370 m_name->as_C_string(), m_signature->as_C_string(), k, j)); | |
| 3371 | |
| 3372 method->set_is_obsolete(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3373 // Leave obsolete methods on the previous version list to |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3374 // clean up later. |
| 0 | 3375 break; |
| 3376 } | |
| 3377 } | |
| 3378 | |
| 3379 // The previous loop may not find a matching EMCP method, but | |
| 3380 // that doesn't mean that we can optimize and not go any | |
| 3381 // further back in the PreviousVersion generations. The EMCP | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3382 // method for this generation could have already been deleted, |
| 0 | 3383 // but there still may be an older EMCP method that has not |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3384 // been deleted. |
| 0 | 3385 } |
| 3386 | |
| 3387 if (++local_count >= obsolete_method_count) { | |
| 3388 // no more obsolete methods so bail out now | |
| 3389 break; | |
| 3390 } | |
| 3391 } | |
| 3392 } | |
| 3393 } | |
| 3394 } // end add_previous_version() | |
| 3395 | |
| 3396 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3397 // Determine if InstanceKlass has a previous version. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3398 bool InstanceKlass::has_previous_version() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3399 return (_previous_versions != NULL && _previous_versions->length() > 0); |
| 0 | 3400 } // end has_previous_version() |
| 3401 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3402 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3403 Method* InstanceKlass::method_with_idnum(int idnum) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3404 Method* m = NULL; |
| 0 | 3405 if (idnum < methods()->length()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3406 m = methods()->at(idnum); |
| 0 | 3407 } |
| 3408 if (m == NULL || m->method_idnum() != idnum) { | |
| 3409 for (int index = 0; index < methods()->length(); ++index) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3410 m = methods()->at(index); |
| 0 | 3411 if (m->method_idnum() == idnum) { |
| 3412 return m; | |
| 3413 } | |
| 3414 } | |
| 3415 } | |
| 3416 return m; | |
| 3417 } | |
| 3418 | |
| 3419 | |
| 3420 // Construct a PreviousVersionNode entry for the array hung off | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3421 // the InstanceKlass. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3422 PreviousVersionNode::PreviousVersionNode(ConstantPool* prev_constant_pool, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3423 bool prev_cp_is_weak, GrowableArray<Method*>* prev_EMCP_methods) { |
| 0 | 3424 |
| 3425 _prev_constant_pool = prev_constant_pool; | |
|
47
2c106685d6d0
6497639: 4/3 Profiling Swing application caused JVM crash
dcubed
parents:
0
diff
changeset
|
3426 _prev_cp_is_weak = prev_cp_is_weak; |
| 0 | 3427 _prev_EMCP_methods = prev_EMCP_methods; |
| 3428 } | |
| 3429 | |
| 3430 | |
| 3431 // Destroy a PreviousVersionNode | |
| 3432 PreviousVersionNode::~PreviousVersionNode() { | |
| 3433 if (_prev_constant_pool != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3434 _prev_constant_pool = NULL; |
| 0 | 3435 } |
| 3436 | |
| 3437 if (_prev_EMCP_methods != NULL) { | |
| 3438 delete _prev_EMCP_methods; | |
| 3439 } | |
| 3440 } | |
| 3441 | |
| 3442 | |
| 3443 // Construct a PreviousVersionInfo entry | |
| 3444 PreviousVersionInfo::PreviousVersionInfo(PreviousVersionNode *pv_node) { | |
| 3445 _prev_constant_pool_handle = constantPoolHandle(); // NULL handle | |
| 3446 _prev_EMCP_method_handles = NULL; | |
| 3447 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3448 ConstantPool* cp = pv_node->prev_constant_pool(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3449 assert(cp != NULL, "constant pool ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3450 if (cp == NULL) { |
| 0 | 3451 return; // robustness |
| 3452 } | |
| 3453 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3454 // make the ConstantPool* safe to return |
| 0 | 3455 _prev_constant_pool_handle = constantPoolHandle(cp); |
| 3456 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3457 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
| 0 | 3458 if (method_refs == NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3459 // the InstanceKlass did not have any EMCP methods |
| 0 | 3460 return; |
| 3461 } | |
| 3462 | |
| 3463 _prev_EMCP_method_handles = new GrowableArray<methodHandle>(10); | |
| 3464 | |
| 3465 int n_methods = method_refs->length(); | |
| 3466 for (int i = 0; i < n_methods; i++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3467 Method* method = method_refs->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3468 assert (method != NULL, "method has been cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3469 if (method == NULL) { |
| 0 | 3470 continue; // robustness |
| 3471 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3472 // make the Method* safe to return |
| 0 | 3473 _prev_EMCP_method_handles->append(methodHandle(method)); |
| 3474 } | |
| 3475 } | |
| 3476 | |
| 3477 | |
| 3478 // Destroy a PreviousVersionInfo | |
| 3479 PreviousVersionInfo::~PreviousVersionInfo() { | |
| 3480 // Since _prev_EMCP_method_handles is not C-heap allocated, we | |
| 3481 // don't have to delete it. | |
| 3482 } | |
| 3483 | |
| 3484 | |
| 3485 // Construct a helper for walking the previous versions array | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3486 PreviousVersionWalker::PreviousVersionWalker(InstanceKlass *ik) { |
| 0 | 3487 _previous_versions = ik->previous_versions(); |
| 3488 _current_index = 0; | |
| 3489 // _hm needs no initialization | |
| 3490 _current_p = NULL; | |
| 3491 } | |
| 3492 | |
| 3493 | |
| 3494 // Destroy a PreviousVersionWalker | |
| 3495 PreviousVersionWalker::~PreviousVersionWalker() { | |
| 3496 // Delete the current info just in case the caller didn't walk to | |
| 3497 // the end of the previous versions list. No harm if _current_p is | |
| 3498 // already NULL. | |
| 3499 delete _current_p; | |
| 3500 | |
| 3501 // When _hm is destroyed, all the Handles returned in | |
| 3502 // PreviousVersionInfo objects will be destroyed. | |
| 3503 // Also, after this destructor is finished it will be | |
| 3504 // safe to delete the GrowableArray allocated in the | |
| 3505 // PreviousVersionInfo objects. | |
| 3506 } | |
| 3507 | |
| 3508 | |
| 3509 // Return the interesting information for the next previous version | |
| 3510 // of the klass. Returns NULL if there are no more previous versions. | |
| 3511 PreviousVersionInfo* PreviousVersionWalker::next_previous_version() { | |
| 3512 if (_previous_versions == NULL) { | |
| 3513 // no previous versions so nothing to return | |
| 3514 return NULL; | |
| 3515 } | |
| 3516 | |
| 3517 delete _current_p; // cleanup the previous info for the caller | |
| 3518 _current_p = NULL; // reset to NULL so we don't delete same object twice | |
| 3519 | |
| 3520 int length = _previous_versions->length(); | |
| 3521 | |
| 3522 while (_current_index < length) { | |
| 3523 PreviousVersionNode * pv_node = _previous_versions->at(_current_index++); | |
| 6197 | 3524 PreviousVersionInfo * pv_info = new (ResourceObj::C_HEAP, mtClass) |
| 0 | 3525 PreviousVersionInfo(pv_node); |
| 3526 | |
| 3527 constantPoolHandle cp_h = pv_info->prev_constant_pool_handle(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3528 assert (!cp_h.is_null(), "null cp found in previous version"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3529 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3530 // The caller will need to delete pv_info when they are done with it. |
| 0 | 3531 _current_p = pv_info; |
| 3532 return pv_info; | |
| 3533 } | |
| 3534 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3535 // all of the underlying nodes' info has been deleted |
| 0 | 3536 return NULL; |
| 3537 } // end next_previous_version() |