author | rehn |
Tue, 15 Mar 2016 14:41:07 +0100 | |
changeset 37161 | e881f320966e |
parent 37094 | c12f414936a1 |
child 37179 | 4dbcb3a642d2 |
permissions | -rw-r--r-- |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1 |
/* |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
2 |
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
4 |
* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
8 |
* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
13 |
* accompanied this code). |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
14 |
* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
18 |
* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
21 |
* questions. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
22 |
* |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
23 |
*/ |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
24 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
25 |
#include "precompiled.hpp" |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
26 |
#include "classfile/classListParser.hpp" |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
27 |
#include "classfile/classLoaderExt.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
28 |
#include "classfile/dictionary.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
29 |
#include "classfile/loaderConstraints.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
30 |
#include "classfile/placeholders.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
31 |
#include "classfile/sharedClassUtil.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
32 |
#include "classfile/symbolTable.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
33 |
#include "classfile/systemDictionary.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
34 |
#include "code/codeCache.hpp" |
30764 | 35 |
#include "gc/shared/gcLocker.hpp" |
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
36 |
#include "interpreter/bytecodeStream.hpp" |
30764 | 37 |
#include "interpreter/bytecodes.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
38 |
#include "memory/filemap.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
39 |
#include "memory/metaspace.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
40 |
#include "memory/metaspaceShared.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
41 |
#include "oops/objArrayOop.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
42 |
#include "oops/oop.inline.hpp" |
37161
e881f320966e
8150015: Integrate TraceTime with Unified Logging more seamlessly
rehn
parents:
37094
diff
changeset
|
43 |
#include "runtime/timerTrace.hpp" |
25468
5331df506290
8048241: Introduce umbrella header os.inline.hpp and clean up includes
goetz
parents:
24424
diff
changeset
|
44 |
#include "runtime/os.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
45 |
#include "runtime/signature.hpp" |
30764 | 46 |
#include "runtime/vmThread.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
47 |
#include "runtime/vm_operations.hpp" |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
48 |
#include "utilities/defaultStream.hpp" |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
49 |
#include "utilities/hashtable.inline.hpp" |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
50 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
51 |
int MetaspaceShared::_max_alignment = 0; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
52 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
53 |
ReservedSpace* MetaspaceShared::_shared_rs = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
54 |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
55 |
MetaspaceSharedStats MetaspaceShared::_stats; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
56 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
57 |
bool MetaspaceShared::_link_classes_made_progress; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
58 |
bool MetaspaceShared::_check_classes_made_progress; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
59 |
bool MetaspaceShared::_has_error_classes; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
60 |
bool MetaspaceShared::_archive_loading_failed = false; |
35231 | 61 |
SharedMiscRegion MetaspaceShared::_mc; |
62 |
SharedMiscRegion MetaspaceShared::_md; |
|
63 |
||
64 |
void SharedMiscRegion::initialize(ReservedSpace rs, size_t committed_byte_size, SharedSpaceType space_type) { |
|
65 |
_vs.initialize(rs, committed_byte_size); |
|
66 |
_alloc_top = _vs.low(); |
|
67 |
_space_type = space_type; |
|
68 |
} |
|
69 |
||
70 |
// NOT thread-safe, but this is called during dump time in single-threaded mode. |
|
71 |
char* SharedMiscRegion::alloc(size_t num_bytes) { |
|
72 |
assert(DumpSharedSpaces, "dump time only"); |
|
73 |
size_t alignment = sizeof(char*); |
|
74 |
num_bytes = align_size_up(num_bytes, alignment); |
|
75 |
_alloc_top = (char*)align_ptr_up(_alloc_top, alignment); |
|
76 |
if (_alloc_top + num_bytes > _vs.high()) { |
|
77 |
report_out_of_shared_space(_space_type); |
|
78 |
} |
|
79 |
||
80 |
char* p = _alloc_top; |
|
81 |
_alloc_top += num_bytes; |
|
82 |
||
83 |
memset(p, 0, num_bytes); |
|
84 |
return p; |
|
85 |
} |
|
86 |
||
87 |
void MetaspaceShared::initialize_shared_rs(ReservedSpace* rs) { |
|
88 |
assert(DumpSharedSpaces, "dump time only"); |
|
89 |
_shared_rs = rs; |
|
90 |
||
91 |
// Split up and initialize the misc code and data spaces |
|
92 |
size_t metadata_size = SharedReadOnlySize + SharedReadWriteSize; |
|
93 |
ReservedSpace shared_ro_rw = _shared_rs->first_part(metadata_size); |
|
94 |
ReservedSpace misc_section = _shared_rs->last_part(metadata_size); |
|
95 |
||
96 |
// Now split into misc sections. |
|
97 |
ReservedSpace md_rs = misc_section.first_part(SharedMiscDataSize); |
|
98 |
ReservedSpace mc_rs = misc_section.last_part(SharedMiscDataSize); |
|
99 |
_md.initialize(md_rs, SharedMiscDataSize, SharedMiscData); |
|
100 |
_mc.initialize(mc_rs, SharedMiscCodeSize, SharedMiscData); |
|
101 |
} |
|
102 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
103 |
// Read/write a data stream for restoring/preserving metadata pointers and |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
104 |
// miscellaneous data from/to the shared archive file. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
105 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
106 |
void MetaspaceShared::serialize(SerializeClosure* soc) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
107 |
int tag = 0; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
108 |
soc->do_tag(--tag); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
109 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
110 |
// Verify the sizes of various metadata in the system. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
111 |
soc->do_tag(sizeof(Method)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
112 |
soc->do_tag(sizeof(ConstMethod)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
113 |
soc->do_tag(arrayOopDesc::base_offset_in_bytes(T_BYTE)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
114 |
soc->do_tag(sizeof(ConstantPool)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
115 |
soc->do_tag(sizeof(ConstantPoolCache)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
116 |
soc->do_tag(objArrayOopDesc::base_offset_in_bytes()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
117 |
soc->do_tag(typeArrayOopDesc::base_offset_in_bytes(T_BYTE)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
118 |
soc->do_tag(sizeof(Symbol)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
119 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
120 |
// Dump/restore miscellaneous metadata. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
121 |
Universe::serialize(soc, true); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
122 |
soc->do_tag(--tag); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
123 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
124 |
// Dump/restore references to commonly used names and signatures. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
125 |
vmSymbols::serialize(soc); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
126 |
soc->do_tag(--tag); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
127 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
128 |
soc->do_tag(666); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
129 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
130 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
131 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
132 |
// CDS code for dumping shared archive. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
133 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
134 |
// Global object for holding classes that have been loaded. Since this |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
135 |
// is run at a safepoint just before exit, this is the entire set of classes. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
136 |
static GrowableArray<Klass*>* _global_klass_objects; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
137 |
static void collect_classes(Klass* k) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
138 |
_global_klass_objects->append_if_missing(k); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
139 |
if (k->is_instance_klass()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
140 |
// Add in the array classes too |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
141 |
InstanceKlass* ik = InstanceKlass::cast(k); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
142 |
ik->array_klasses_do(collect_classes); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
143 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
144 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
145 |
|
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
146 |
static void collect_classes2(Klass* k, ClassLoaderData* class_data) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
147 |
collect_classes(k); |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
148 |
} |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
149 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
150 |
static void remove_unshareable_in_classes() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
151 |
for (int i = 0; i < _global_klass_objects->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
152 |
Klass* k = _global_klass_objects->at(i); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
153 |
k->remove_unshareable_info(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
154 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
155 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
156 |
|
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
157 |
static void rewrite_nofast_bytecode(Method* method) { |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
158 |
RawBytecodeStream bcs(method); |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
159 |
while (!bcs.is_last_bytecode()) { |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
160 |
Bytecodes::Code opcode = bcs.raw_next(); |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
161 |
switch (opcode) { |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
162 |
case Bytecodes::_getfield: *bcs.bcp() = Bytecodes::_nofast_getfield; break; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
163 |
case Bytecodes::_putfield: *bcs.bcp() = Bytecodes::_nofast_putfield; break; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
164 |
case Bytecodes::_aload_0: *bcs.bcp() = Bytecodes::_nofast_aload_0; break; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
165 |
case Bytecodes::_iload: *bcs.bcp() = Bytecodes::_nofast_iload; break; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
166 |
default: break; |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
167 |
} |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
168 |
} |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
169 |
} |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
170 |
|
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
171 |
// Walk all methods in the class list to ensure that they won't be modified at |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
172 |
// run time. This includes: |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
173 |
// [1] Rewrite all bytecodes as needed, so that the ConstMethod* will not be modified |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
174 |
// at run time by RewriteBytecodes/RewriteFrequentPairs |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
175 |
// [2] Assign a fingerprint, so one doesn't need to be assigned at run-time. |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
176 |
static void rewrite_nofast_bytecodes_and_calculate_fingerprints() { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
177 |
for (int i = 0; i < _global_klass_objects->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
178 |
Klass* k = _global_klass_objects->at(i); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
179 |
if (k->is_instance_klass()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
180 |
InstanceKlass* ik = InstanceKlass::cast(k); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
181 |
for (int i = 0; i < ik->methods()->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
182 |
Method* m = ik->methods()->at(i); |
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
183 |
rewrite_nofast_bytecode(m); |
20059
c26474fd5ac0
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
19319
diff
changeset
|
184 |
Fingerprinter fp(m); |
c26474fd5ac0
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
19319
diff
changeset
|
185 |
// The side effect of this call sets method's fingerprint field. |
c26474fd5ac0
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
19319
diff
changeset
|
186 |
fp.fingerprint(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
187 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
188 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
189 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
190 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
191 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
192 |
// Patch C++ vtable pointer in metadata. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
193 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
194 |
// Klass and other metadata objects contain references to c++ vtables in the |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
195 |
// JVM library. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
196 |
// Fix them to point to our constructed vtables. However, don't iterate |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
197 |
// across the space while doing this, as that causes the vtables to be |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
198 |
// patched, undoing our useful work. Instead, iterate to make a list, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
199 |
// then use the list to do the fixing. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
200 |
// |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
201 |
// Our constructed vtables: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
202 |
// Dump time: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
203 |
// 1. init_self_patching_vtbl_list: table of pointers to current virtual method addrs |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
204 |
// 2. generate_vtable_methods: create jump table, appended to above vtbl_list |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
205 |
// 3. patch_klass_vtables: for Klass list, patch the vtable entry in klass and |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
206 |
// associated metadata to point to jump table rather than to current vtbl |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
207 |
// Table layout: NOTE FIXED SIZE |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
208 |
// 1. vtbl pointers |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
209 |
// 2. #Klass X #virtual methods per Klass |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
210 |
// 1 entry for each, in the order: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
211 |
// Klass1:method1 entry, Klass1:method2 entry, ... Klass1:method<num_virtuals> entry |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
212 |
// Klass2:method1 entry, Klass2:method2 entry, ... Klass2:method<num_virtuals> entry |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
213 |
// ... |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
214 |
// Klass<vtbl_list_size>:method1 entry, Klass<vtbl_list_size>:method2 entry, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
215 |
// ... Klass<vtbl_list_size>:method<num_virtuals> entry |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
216 |
// Sample entry: (Sparc): |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
217 |
// save(sp, -256, sp) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
218 |
// ba,pt common_code |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
219 |
// mov XXX, %L0 %L0 gets: Klass index <<8 + method index (note: max method index 255) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
220 |
// |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
221 |
// Restore time: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
222 |
// 1. initialize_shared_space: reserve space for table |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
223 |
// 2. init_self_patching_vtbl_list: update pointers to NEW virtual method addrs in text |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
224 |
// |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
225 |
// Execution time: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
226 |
// First virtual method call for any object of these metadata types: |
13736
5b15a8f57979
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
13728
diff
changeset
|
227 |
// 1. object->klass |
5b15a8f57979
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
13728
diff
changeset
|
228 |
// 2. vtable entry for that klass points to the jump table entries |
5b15a8f57979
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
13728
diff
changeset
|
229 |
// 3. branches to common_code with %O0/klass, %L0: Klass index <<8 + method index |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
230 |
// 4. common_code: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
231 |
// Get address of new vtbl pointer for this Klass from updated table |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
232 |
// Update new vtbl pointer in the Klass: future virtual calls go direct |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
233 |
// Jump to method, using new vtbl pointer and method index |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
234 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
235 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
236 |
static void* find_matching_vtbl_ptr(void** vtbl_list, void* new_vtable_start, void* obj) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
237 |
void* old_vtbl_ptr = *(void**)obj; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
238 |
for (int i = 0; i < MetaspaceShared::vtbl_list_size; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
239 |
if (vtbl_list[i] == old_vtbl_ptr) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
240 |
return (void**)new_vtable_start + i * MetaspaceShared::num_virtuals; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
241 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
242 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
243 |
ShouldNotReachHere(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
244 |
return NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
245 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
246 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
247 |
// Assumes the vtable is in first slot in object. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
248 |
static void patch_klass_vtables(void** vtbl_list, void* new_vtable_start) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
249 |
int n = _global_klass_objects->length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
250 |
for (int i = 0; i < n; i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
251 |
Klass* obj = _global_klass_objects->at(i); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
252 |
// Note is_instance_klass() is a virtual call in debug. After patching vtables |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
253 |
// all virtual calls on the dummy vtables will restore the original! |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
254 |
if (obj->is_instance_klass()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
255 |
InstanceKlass* ik = InstanceKlass::cast(obj); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
256 |
*(void**)ik = find_matching_vtbl_ptr(vtbl_list, new_vtable_start, ik); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
257 |
ConstantPool* cp = ik->constants(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
258 |
*(void**)cp = find_matching_vtbl_ptr(vtbl_list, new_vtable_start, cp); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
259 |
for (int j = 0; j < ik->methods()->length(); j++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
260 |
Method* m = ik->methods()->at(j); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
261 |
*(void**)m = find_matching_vtbl_ptr(vtbl_list, new_vtable_start, m); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
262 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
263 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
264 |
// Array klasses |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
265 |
Klass* k = obj; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
266 |
*(void**)k = find_matching_vtbl_ptr(vtbl_list, new_vtable_start, k); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
267 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
268 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
269 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
270 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
271 |
// Closure for serializing initialization data out to a data area to be |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
272 |
// written to the shared file. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
273 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
274 |
class WriteClosure : public SerializeClosure { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
275 |
private: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
276 |
intptr_t* top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
277 |
char* end; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
278 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
279 |
inline void check_space() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
280 |
if ((char*)top + sizeof(intptr_t) > end) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
281 |
report_out_of_shared_space(SharedMiscData); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
282 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
283 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
284 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
285 |
public: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
286 |
WriteClosure(char* md_top, char* md_end) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
287 |
top = (intptr_t*)md_top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
288 |
end = md_end; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
289 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
290 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
291 |
char* get_top() { return (char*)top; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
292 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
293 |
void do_ptr(void** p) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
294 |
check_space(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
295 |
*top = (intptr_t)*p; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
296 |
++top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
297 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
298 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
299 |
void do_tag(int tag) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
300 |
check_space(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
301 |
*top = (intptr_t)tag; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
302 |
++top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
303 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
304 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
305 |
void do_region(u_char* start, size_t size) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
306 |
if ((char*)top + size > end) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
307 |
report_out_of_shared_space(SharedMiscData); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
308 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
309 |
assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
310 |
assert(size % sizeof(intptr_t) == 0, "bad size"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
311 |
do_tag((int)size); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
312 |
while (size > 0) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
313 |
*top = *(intptr_t*)start; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
314 |
++top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
315 |
start += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
316 |
size -= sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
317 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
318 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
319 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
320 |
bool reading() const { return false; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
321 |
}; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
322 |
|
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
323 |
// This is for dumping detailed statistics for the allocations |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
324 |
// in the shared spaces. |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
325 |
class DumpAllocClosure : public Metaspace::AllocRecordClosure { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
326 |
public: |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
327 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
328 |
// Here's poor man's enum inheritance |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
329 |
#define SHAREDSPACE_OBJ_TYPES_DO(f) \ |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
330 |
METASPACE_OBJ_TYPES_DO(f) \ |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
331 |
f(SymbolHashentry) \ |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
332 |
f(SymbolBucket) \ |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
333 |
f(Other) |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
334 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
335 |
#define SHAREDSPACE_OBJ_TYPE_DECLARE(name) name ## Type, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
336 |
#define SHAREDSPACE_OBJ_TYPE_NAME_CASE(name) case name ## Type: return #name; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
337 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
338 |
enum Type { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
339 |
// Types are MetaspaceObj::ClassType, MetaspaceObj::SymbolType, etc |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
340 |
SHAREDSPACE_OBJ_TYPES_DO(SHAREDSPACE_OBJ_TYPE_DECLARE) |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
341 |
_number_of_types |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
342 |
}; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
343 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
344 |
static const char * type_name(Type type) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
345 |
switch(type) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
346 |
SHAREDSPACE_OBJ_TYPES_DO(SHAREDSPACE_OBJ_TYPE_NAME_CASE) |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
347 |
default: |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
348 |
ShouldNotReachHere(); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
349 |
return NULL; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
350 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
351 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
352 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
353 |
public: |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
354 |
enum { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
355 |
RO = 0, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
356 |
RW = 1 |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
357 |
}; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
358 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
359 |
int _counts[2][_number_of_types]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
360 |
int _bytes [2][_number_of_types]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
361 |
int _which; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
362 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
363 |
DumpAllocClosure() { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
364 |
memset(_counts, 0, sizeof(_counts)); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
365 |
memset(_bytes, 0, sizeof(_bytes)); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
366 |
}; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
367 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
368 |
void iterate_metaspace(Metaspace* space, int which) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
369 |
assert(which == RO || which == RW, "sanity"); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
370 |
_which = which; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
371 |
space->iterate(this); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
372 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
373 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
374 |
virtual void doit(address ptr, MetaspaceObj::Type type, int byte_size) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
375 |
assert(int(type) >= 0 && type < MetaspaceObj::_number_of_types, "sanity"); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
376 |
_counts[_which][type] ++; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
377 |
_bytes [_which][type] += byte_size; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
378 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
379 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
380 |
void dump_stats(int ro_all, int rw_all, int md_all, int mc_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
381 |
}; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
382 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
383 |
void DumpAllocClosure::dump_stats(int ro_all, int rw_all, int md_all, int mc_all) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
384 |
rw_all += (md_all + mc_all); // md and mc are all mapped Read/Write |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
385 |
int other_bytes = md_all + mc_all; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
386 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
387 |
// Calculate size of data that was not allocated by Metaspace::allocate() |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
388 |
MetaspaceSharedStats *stats = MetaspaceShared::stats(); |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
389 |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
390 |
// symbols |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
391 |
_counts[RW][SymbolHashentryType] = stats->symbol.hashentry_count; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
392 |
_bytes [RW][SymbolHashentryType] = stats->symbol.hashentry_bytes; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
393 |
other_bytes -= stats->symbol.hashentry_bytes; |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
394 |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
395 |
_counts[RW][SymbolBucketType] = stats->symbol.bucket_count; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
396 |
_bytes [RW][SymbolBucketType] = stats->symbol.bucket_bytes; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
397 |
other_bytes -= stats->symbol.bucket_bytes; |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
398 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
399 |
// TODO: count things like dictionary, vtable, etc |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
400 |
_bytes[RW][OtherType] = other_bytes; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
401 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
402 |
// prevent divide-by-zero |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
403 |
if (ro_all < 1) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
404 |
ro_all = 1; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
405 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
406 |
if (rw_all < 1) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
407 |
rw_all = 1; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
408 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
409 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
410 |
int all_ro_count = 0; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
411 |
int all_ro_bytes = 0; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
412 |
int all_rw_count = 0; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
413 |
int all_rw_bytes = 0; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
414 |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
415 |
// To make fmt_stats be a syntactic constant (for format warnings), use #define. |
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
416 |
#define fmt_stats "%-20s: %8d %10d %5.1f | %8d %10d %5.1f | %8d %10d %5.1f" |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
417 |
const char *sep = "--------------------+---------------------------+---------------------------+--------------------------"; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
418 |
const char *hdr = " ro_cnt ro_bytes % | rw_cnt rw_bytes % | all_cnt all_bytes %"; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
419 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
420 |
tty->print_cr("Detailed metadata info (rw includes md and mc):"); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
421 |
tty->print_cr("%s", hdr); |
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
422 |
tty->print_cr("%s", sep); |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
423 |
for (int type = 0; type < int(_number_of_types); type ++) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
424 |
const char *name = type_name((Type)type); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
425 |
int ro_count = _counts[RO][type]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
426 |
int ro_bytes = _bytes [RO][type]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
427 |
int rw_count = _counts[RW][type]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
428 |
int rw_bytes = _bytes [RW][type]; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
429 |
int count = ro_count + rw_count; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
430 |
int bytes = ro_bytes + rw_bytes; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
431 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
432 |
double ro_perc = 100.0 * double(ro_bytes) / double(ro_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
433 |
double rw_perc = 100.0 * double(rw_bytes) / double(rw_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
434 |
double perc = 100.0 * double(bytes) / double(ro_all + rw_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
435 |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
436 |
tty->print_cr(fmt_stats, name, |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
437 |
ro_count, ro_bytes, ro_perc, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
438 |
rw_count, rw_bytes, rw_perc, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
439 |
count, bytes, perc); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
440 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
441 |
all_ro_count += ro_count; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
442 |
all_ro_bytes += ro_bytes; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
443 |
all_rw_count += rw_count; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
444 |
all_rw_bytes += rw_bytes; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
445 |
} |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
446 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
447 |
int all_count = all_ro_count + all_rw_count; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
448 |
int all_bytes = all_ro_bytes + all_rw_bytes; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
449 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
450 |
double all_ro_perc = 100.0 * double(all_ro_bytes) / double(ro_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
451 |
double all_rw_perc = 100.0 * double(all_rw_bytes) / double(rw_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
452 |
double all_perc = 100.0 * double(all_bytes) / double(ro_all + rw_all); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
453 |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
454 |
tty->print_cr("%s", sep); |
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
455 |
tty->print_cr(fmt_stats, "Total", |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
456 |
all_ro_count, all_ro_bytes, all_ro_perc, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
457 |
all_rw_count, all_rw_bytes, all_rw_perc, |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
458 |
all_count, all_bytes, all_perc); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
459 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
460 |
assert(all_ro_bytes == ro_all, "everything should have been counted"); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
461 |
assert(all_rw_bytes == rw_all, "everything should have been counted"); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
462 |
#undef fmt_stats |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
463 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
464 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
465 |
// Populate the shared space. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
466 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
467 |
class VM_PopulateDumpSharedSpace: public VM_Operation { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
468 |
private: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
469 |
ClassLoaderData* _loader_data; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
470 |
GrowableArray<Klass*> *_class_promote_order; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
471 |
VirtualSpace _md_vs; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
472 |
VirtualSpace _mc_vs; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
473 |
CompactHashtableWriter* _string_cht; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
474 |
GrowableArray<MemRegion> *_string_regions; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
475 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
476 |
public: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
477 |
VM_PopulateDumpSharedSpace(ClassLoaderData* loader_data, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
478 |
GrowableArray<Klass*> *class_promote_order) : |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
479 |
_loader_data(loader_data) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
480 |
_class_promote_order = class_promote_order; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
481 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
482 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
483 |
VMOp_Type type() const { return VMOp_PopulateDumpSharedSpace; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
484 |
void doit(); // outline because gdb sucks |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
485 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
486 |
private: |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
487 |
void handle_misc_data_space_failure(bool success) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
488 |
if (!success) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
489 |
report_out_of_shared_space(SharedMiscData); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
490 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
491 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
492 |
}; // class VM_PopulateDumpSharedSpace |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
493 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
494 |
void VM_PopulateDumpSharedSpace::doit() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
495 |
Thread* THREAD = VMThread::vm_thread(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
496 |
NOT_PRODUCT(SystemDictionary::verify();) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
497 |
// The following guarantee is meant to ensure that no loader constraints |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
498 |
// exist yet, since the constraints table is not shared. This becomes |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
499 |
// more important now that we don't re-initialize vtables/itables for |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
500 |
// shared classes at runtime, where constraints were previously created. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
501 |
guarantee(SystemDictionary::constraints()->number_of_entries() == 0, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
502 |
"loader constraints are not saved"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
503 |
guarantee(SystemDictionary::placeholders()->number_of_entries() == 0, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
504 |
"placeholders are not saved"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
505 |
// Revisit and implement this if we prelink method handle call sites: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
506 |
guarantee(SystemDictionary::invoke_method_table() == NULL || |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
507 |
SystemDictionary::invoke_method_table()->number_of_entries() == 0, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
508 |
"invoke method table is not saved"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
509 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
510 |
// At this point, many classes have been loaded. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
511 |
// Gather systemDictionary classes in a global array and do everything to |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
512 |
// that so we don't have to walk the SystemDictionary again. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
513 |
_global_klass_objects = new GrowableArray<Klass*>(1000); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
514 |
Universe::basic_type_classes_do(collect_classes); |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
515 |
|
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
516 |
// Need to call SystemDictionary::classes_do(void f(Klass*, ClassLoaderData*)) |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
517 |
// as we may have some classes with NULL ClassLoaderData* in the dictionary. Other |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
518 |
// variants of SystemDictionary::classes_do will skip those classes. |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
519 |
SystemDictionary::classes_do(collect_classes2); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
520 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
521 |
tty->print_cr("Number of classes %d", _global_klass_objects->length()); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
522 |
{ |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
523 |
int num_type_array = 0, num_obj_array = 0, num_inst = 0; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
524 |
for (int i = 0; i < _global_klass_objects->length(); i++) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
525 |
Klass* k = _global_klass_objects->at(i); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
526 |
if (k->is_instance_klass()) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
527 |
num_inst ++; |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
528 |
} else if (k->is_objArray_klass()) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
529 |
num_obj_array ++; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
530 |
} else { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
531 |
assert(k->is_typeArray_klass(), "sanity"); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
532 |
num_type_array ++; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
533 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
534 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
535 |
tty->print_cr(" instance classes = %5d", num_inst); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
536 |
tty->print_cr(" obj array classes = %5d", num_obj_array); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
537 |
tty->print_cr(" type array classes = %5d", num_type_array); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
538 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
539 |
|
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
540 |
|
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
541 |
// Ensure the ConstMethods won't be modified at run-time |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
542 |
tty->print("Updating ConstMethods ... "); |
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
28363
diff
changeset
|
543 |
rewrite_nofast_bytecodes_and_calculate_fingerprints(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
544 |
tty->print_cr("done. "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
545 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
546 |
// Remove all references outside the metadata |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
547 |
tty->print("Removing unshareable information ... "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
548 |
remove_unshareable_in_classes(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
549 |
tty->print_cr("done. "); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
550 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
551 |
// Set up the share data and shared code segments. |
35231 | 552 |
_md_vs = *MetaspaceShared::misc_data_region()->virtual_space(); |
553 |
_mc_vs = *MetaspaceShared::misc_code_region()->virtual_space(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
554 |
char* md_low = _md_vs.low(); |
35231 | 555 |
char* md_top = MetaspaceShared::misc_data_region()->alloc_top(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
556 |
char* md_end = _md_vs.high(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
557 |
char* mc_low = _mc_vs.low(); |
35231 | 558 |
char* mc_top = MetaspaceShared::misc_code_region()->alloc_top(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
559 |
char* mc_end = _mc_vs.high(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
560 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
561 |
// Reserve space for the list of Klass*s whose vtables are used |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
562 |
// for patching others as needed. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
563 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
564 |
void** vtbl_list = (void**)md_top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
565 |
int vtbl_list_size = MetaspaceShared::vtbl_list_size; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
566 |
Universe::init_self_patching_vtbl_list(vtbl_list, vtbl_list_size); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
567 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
568 |
md_top += vtbl_list_size * sizeof(void*); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
569 |
void* vtable = md_top; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
570 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
571 |
// Reserve space for a new dummy vtable for klass objects in the |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
572 |
// heap. Generate self-patching vtable entries. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
573 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
574 |
MetaspaceShared::generate_vtable_methods(vtbl_list, &vtable, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
575 |
&md_top, md_end, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
576 |
&mc_top, mc_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
577 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
578 |
// Reorder the system dictionary. (Moving the symbols affects |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
579 |
// how the hash table indices are calculated.) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
580 |
// Not doing this either. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
581 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
582 |
SystemDictionary::reorder_dictionary(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
583 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
584 |
NOT_PRODUCT(SystemDictionary::verify();) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
585 |
|
33628 | 586 |
// Copy the symbol table, string table, and the system dictionary to the shared |
22551 | 587 |
// space in usable form. Copy the hashtable |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
588 |
// buckets first [read-write], then copy the linked lists of entries |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
589 |
// [read-only]. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
590 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
591 |
NOT_PRODUCT(SymbolTable::verify()); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
592 |
handle_misc_data_space_failure(SymbolTable::copy_compact_table(&md_top, md_end)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
593 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
594 |
size_t ss_bytes = 0; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
595 |
char* ss_low; |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
596 |
// The string space has maximum two regions. See FileMapInfo::write_string_regions() for details. |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
597 |
_string_regions = new GrowableArray<MemRegion>(2); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
598 |
NOT_PRODUCT(StringTable::verify()); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
599 |
handle_misc_data_space_failure(StringTable::copy_compact_table(&md_top, md_end, _string_regions, |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
600 |
&ss_bytes)); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
601 |
ss_low = _string_regions->is_empty() ? NULL : (char*)_string_regions->first().start(); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
602 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
603 |
SystemDictionary::reverse(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
604 |
SystemDictionary::copy_buckets(&md_top, md_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
605 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
606 |
ClassLoader::verify(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
607 |
ClassLoader::copy_package_info_buckets(&md_top, md_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
608 |
ClassLoader::verify(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
609 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
610 |
SystemDictionary::copy_table(&md_top, md_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
611 |
ClassLoader::verify(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
612 |
ClassLoader::copy_package_info_table(&md_top, md_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
613 |
ClassLoader::verify(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
614 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
615 |
// Write the other data to the output array. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
616 |
WriteClosure wc(md_top, md_end); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
617 |
MetaspaceShared::serialize(&wc); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
618 |
md_top = wc.get_top(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
619 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
620 |
// Print shared spaces all the time |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
621 |
// To make fmt_space be a syntactic constant (for format warnings), use #define. |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
622 |
#define fmt_space "%s space: " SIZE_FORMAT_W(9) " [ %4.1f%% of total] out of " SIZE_FORMAT_W(9) " bytes [%4.1f%% used] at " INTPTR_FORMAT |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
623 |
Metaspace* ro_space = _loader_data->ro_metaspace(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
624 |
Metaspace* rw_space = _loader_data->rw_metaspace(); |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
625 |
|
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
626 |
// Allocated size of each space (may not be all occupied) |
17109
90e6c31bbbe4
8008966: NPG: Inefficient Metaspace counter functions cause large young GC regressions
jmasa
parents:
15197
diff
changeset
|
627 |
const size_t ro_alloced = ro_space->capacity_bytes_slow(Metaspace::NonClassType); |
90e6c31bbbe4
8008966: NPG: Inefficient Metaspace counter functions cause large young GC regressions
jmasa
parents:
15197
diff
changeset
|
628 |
const size_t rw_alloced = rw_space->capacity_bytes_slow(Metaspace::NonClassType); |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
629 |
const size_t md_alloced = md_end-md_low; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
630 |
const size_t mc_alloced = mc_end-mc_low; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
631 |
const size_t total_alloced = ro_alloced + rw_alloced + md_alloced + mc_alloced |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
632 |
+ ss_bytes; |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
633 |
|
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
634 |
// Occupied size of each space. |
17109
90e6c31bbbe4
8008966: NPG: Inefficient Metaspace counter functions cause large young GC regressions
jmasa
parents:
15197
diff
changeset
|
635 |
const size_t ro_bytes = ro_space->used_bytes_slow(Metaspace::NonClassType); |
90e6c31bbbe4
8008966: NPG: Inefficient Metaspace counter functions cause large young GC regressions
jmasa
parents:
15197
diff
changeset
|
636 |
const size_t rw_bytes = rw_space->used_bytes_slow(Metaspace::NonClassType); |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
637 |
const size_t md_bytes = size_t(md_top - md_low); |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
638 |
const size_t mc_bytes = size_t(mc_top - mc_low); |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
639 |
|
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
640 |
// Percent of total size |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
641 |
const size_t total_bytes = ro_bytes + rw_bytes + md_bytes + mc_bytes + ss_bytes; |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
642 |
const double ro_t_perc = ro_bytes / double(total_bytes) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
643 |
const double rw_t_perc = rw_bytes / double(total_bytes) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
644 |
const double md_t_perc = md_bytes / double(total_bytes) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
645 |
const double mc_t_perc = mc_bytes / double(total_bytes) * 100.0; |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
646 |
const double ss_t_perc = ss_bytes / double(total_bytes) * 100.0; |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
647 |
|
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
648 |
// Percent of fullness of each space |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
649 |
const double ro_u_perc = ro_bytes / double(ro_alloced) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
650 |
const double rw_u_perc = rw_bytes / double(rw_alloced) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
651 |
const double md_u_perc = md_bytes / double(md_alloced) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
652 |
const double mc_u_perc = mc_bytes / double(mc_alloced) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
653 |
const double total_u_perc = total_bytes / double(total_alloced) * 100.0; |
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
654 |
|
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
655 |
tty->print_cr(fmt_space, "ro", ro_bytes, ro_t_perc, ro_alloced, ro_u_perc, p2i(ro_space->bottom())); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
656 |
tty->print_cr(fmt_space, "rw", rw_bytes, rw_t_perc, rw_alloced, rw_u_perc, p2i(rw_space->bottom())); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
657 |
tty->print_cr(fmt_space, "md", md_bytes, md_t_perc, md_alloced, md_u_perc, p2i(md_low)); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
658 |
tty->print_cr(fmt_space, "mc", mc_bytes, mc_t_perc, mc_alloced, mc_u_perc, p2i(mc_low)); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
659 |
tty->print_cr(fmt_space, "st", ss_bytes, ss_t_perc, ss_bytes, 100.0, p2i(ss_low)); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31362
diff
changeset
|
660 |
tty->print_cr("total : " SIZE_FORMAT_W(9) " [100.0%% of total] out of " SIZE_FORMAT_W(9) " bytes [%4.1f%% used]", |
15197
cef3fb881307
8005467: CDS size information is incorrect and unfriendly
coleenp
parents:
15100
diff
changeset
|
661 |
total_bytes, total_alloced, total_u_perc); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
662 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
663 |
// Update the vtable pointers in all of the Klass objects in the |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
664 |
// heap. They should point to newly generated vtable. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
665 |
patch_klass_vtables(vtbl_list, vtable); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
666 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
667 |
// dunno what this is for. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
668 |
char* saved_vtbl = (char*)os::malloc(vtbl_list_size * sizeof(void*), mtClass); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
669 |
memmove(saved_vtbl, vtbl_list, vtbl_list_size * sizeof(void*)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
670 |
memset(vtbl_list, 0, vtbl_list_size * sizeof(void*)); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
671 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
672 |
// Create and write the archive file that maps the shared spaces. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
673 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
674 |
FileMapInfo* mapinfo = new FileMapInfo(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
675 |
mapinfo->populate_header(MetaspaceShared::max_alignment()); |
35231 | 676 |
mapinfo->set_misc_data_patching_start((char*)vtbl_list); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
677 |
|
35231 | 678 |
for (int pass=1; pass<=2; pass++) { |
679 |
if (pass == 1) { |
|
680 |
// The first pass doesn't actually write the data to disk. All it |
|
681 |
// does is to update the fields in the mapinfo->_header. |
|
682 |
} else { |
|
683 |
// After the first pass, the contents of mapinfo->_header are finalized, |
|
684 |
// so we can compute the header's CRC, and write the contents of the header |
|
685 |
// and the regions into disk. |
|
686 |
mapinfo->open_for_write(); |
|
687 |
mapinfo->set_header_crc(mapinfo->compute_header_crc()); |
|
688 |
} |
|
689 |
mapinfo->write_header(); |
|
690 |
mapinfo->write_space(MetaspaceShared::ro, _loader_data->ro_metaspace(), true); |
|
691 |
mapinfo->write_space(MetaspaceShared::rw, _loader_data->rw_metaspace(), false); |
|
692 |
mapinfo->write_region(MetaspaceShared::md, _md_vs.low(), |
|
693 |
pointer_delta(md_top, _md_vs.low(), sizeof(char)), |
|
694 |
SharedMiscDataSize, |
|
695 |
false, false); |
|
696 |
mapinfo->write_region(MetaspaceShared::mc, _mc_vs.low(), |
|
697 |
pointer_delta(mc_top, _mc_vs.low(), sizeof(char)), |
|
698 |
SharedMiscCodeSize, |
|
699 |
true, true); |
|
700 |
mapinfo->write_string_regions(_string_regions); |
|
701 |
} |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
702 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
703 |
mapinfo->close(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
704 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
705 |
memmove(vtbl_list, saved_vtbl, vtbl_list_size * sizeof(void*)); |
30753
75e795c4d14f
8075288: malloc without free in VM_PopulateDumpSharedSpace::doit()
dholmes
parents:
30120
diff
changeset
|
706 |
os::free(saved_vtbl); |
17858
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
707 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
708 |
if (PrintSharedSpaces) { |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
709 |
DumpAllocClosure dac; |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
710 |
dac.iterate_metaspace(_loader_data->ro_metaspace(), DumpAllocClosure::RO); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
711 |
dac.iterate_metaspace(_loader_data->rw_metaspace(), DumpAllocClosure::RW); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
712 |
|
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
713 |
dac.dump_stats(int(ro_bytes), int(rw_bytes), int(md_bytes), int(mc_bytes)); |
c292f8791cca
8014912: Restore PrintSharedSpaces functionality after NPG
iklam
parents:
17109
diff
changeset
|
714 |
} |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23540
diff
changeset
|
715 |
#undef fmt_space |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
716 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
717 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
718 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
719 |
void MetaspaceShared::link_one_shared_class(Klass* obj, TRAPS) { |
14488 | 720 |
Klass* k = obj; |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
721 |
if (k->is_instance_klass()) { |
33602 | 722 |
InstanceKlass* ik = InstanceKlass::cast(k); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
723 |
// Link the class to cause the bytecodes to be rewritten and the |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
724 |
// cpcache to be created. Class verification is done according |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
725 |
// to -Xverify setting. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
726 |
_link_classes_made_progress |= try_link_class(ik, THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
727 |
guarantee(!HAS_PENDING_EXCEPTION, "exception in link_class"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
728 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
729 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
730 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
731 |
void MetaspaceShared::check_one_shared_class(Klass* k) { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
732 |
if (k->is_instance_klass() && InstanceKlass::cast(k)->check_sharing_error_state()) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
733 |
_check_classes_made_progress = true; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
734 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
735 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
736 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
737 |
void MetaspaceShared::link_and_cleanup_shared_classes(TRAPS) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
738 |
// We need to iterate because verification may cause additional classes |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
739 |
// to be loaded. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
740 |
do { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
741 |
_link_classes_made_progress = false; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
742 |
SystemDictionary::classes_do(link_one_shared_class, THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
743 |
guarantee(!HAS_PENDING_EXCEPTION, "exception in link_class"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
744 |
} while (_link_classes_made_progress); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
745 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
746 |
if (_has_error_classes) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
747 |
// Mark all classes whose super class or interfaces failed verification. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
748 |
do { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
749 |
// Not completely sure if we need to do this iteratively. Anyway, |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
750 |
// we should come here only if there are unverifiable classes, which |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
751 |
// shouldn't happen in normal cases. So better safe than sorry. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
752 |
_check_classes_made_progress = false; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
753 |
SystemDictionary::classes_do(check_one_shared_class); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
754 |
} while (_check_classes_made_progress); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
755 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
756 |
if (IgnoreUnverifiableClassesDuringDump) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
757 |
// This is useful when running JCK or SQE tests. You should not |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
758 |
// enable this when running real apps. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
759 |
SystemDictionary::remove_classes_in_error_state(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
760 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
761 |
tty->print_cr("Please remove the unverifiable classes from your class list and try again"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
762 |
exit(1); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
763 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
764 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
765 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
766 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
767 |
void MetaspaceShared::prepare_for_dumping() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
768 |
ClassLoader::initialize_shared_path(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
769 |
FileMapInfo::allocate_classpath_entry_table(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
770 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
771 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
772 |
// Preload classes from a list, populate the shared spaces and dump to a |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
773 |
// file. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
774 |
void MetaspaceShared::preload_and_dump(TRAPS) { |
37161
e881f320966e
8150015: Integrate TraceTime with Unified Logging more seamlessly
rehn
parents:
37094
diff
changeset
|
775 |
{ TraceTime timer("Dump Shared Spaces", TRACETIME_LOG(Info, startuptime)); |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
776 |
ResourceMark rm; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
777 |
char class_list_path_str[JVM_MAXPATHLEN]; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
778 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
779 |
tty->print_cr("Allocated shared space: " SIZE_FORMAT " bytes at " PTR_FORMAT, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
780 |
MetaspaceShared::shared_rs()->size(), |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
781 |
p2i(MetaspaceShared::shared_rs()->base())); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
782 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
783 |
// Preload classes to be shared. |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
784 |
// Should use some os:: method rather than fopen() here. aB. |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
785 |
const char* class_list_path; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
786 |
if (SharedClassListFile == NULL) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
787 |
// Construct the path to the class list (in jre/lib) |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
788 |
// Walk up two directories from the location of the VM and |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
789 |
// optionally tack on "lib" (depending on platform) |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
790 |
os::jvm_path(class_list_path_str, sizeof(class_list_path_str)); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
791 |
for (int i = 0; i < 3; i++) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
792 |
char *end = strrchr(class_list_path_str, *os::file_separator()); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
793 |
if (end != NULL) *end = '\0'; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
794 |
} |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
795 |
int class_list_path_len = (int)strlen(class_list_path_str); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
796 |
if (class_list_path_len >= 3) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
797 |
if (strcmp(class_list_path_str + class_list_path_len - 3, "lib") != 0) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
798 |
if (class_list_path_len < JVM_MAXPATHLEN - 4) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
799 |
jio_snprintf(class_list_path_str + class_list_path_len, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
800 |
sizeof(class_list_path_str) - class_list_path_len, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
801 |
"%slib", os::file_separator()); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
802 |
class_list_path_len += 4; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
803 |
} |
27471 | 804 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
805 |
} |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
806 |
if (class_list_path_len < JVM_MAXPATHLEN - 10) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
807 |
jio_snprintf(class_list_path_str + class_list_path_len, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
808 |
sizeof(class_list_path_str) - class_list_path_len, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
809 |
"%sclasslist", os::file_separator()); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
810 |
} |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
811 |
class_list_path = class_list_path_str; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
812 |
} else { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
813 |
class_list_path = SharedClassListFile; |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
814 |
} |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
815 |
|
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
816 |
int class_count = 0; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
817 |
GrowableArray<Klass*>* class_promote_order = new GrowableArray<Klass*>(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
818 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
819 |
// sun.io.Converters |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
820 |
static const char obj_array_sig[] = "[[Ljava/lang/Object;"; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
821 |
SymbolTable::new_permanent_symbol(obj_array_sig, THREAD); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
822 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
823 |
// java.util.HashMap |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
824 |
static const char map_entry_array_sig[] = "[Ljava/util/Map$Entry;"; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
825 |
SymbolTable::new_permanent_symbol(map_entry_array_sig, THREAD); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
826 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
827 |
// Need to allocate the op here: |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
828 |
// op.misc_data_space_alloc() will be called during preload_and_dump(). |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
829 |
ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data(); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
830 |
VM_PopulateDumpSharedSpace op(loader_data, class_promote_order); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
831 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
832 |
tty->print_cr("Loading classes to share ..."); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
833 |
_has_error_classes = false; |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
834 |
class_count += preload_and_dump(class_list_path, class_promote_order, |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
835 |
THREAD); |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
836 |
if (ExtraSharedClassListFile) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
837 |
class_count += preload_and_dump(ExtraSharedClassListFile, class_promote_order, |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
838 |
THREAD); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
839 |
} |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
840 |
tty->print_cr("Loading classes to share: done."); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
841 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
842 |
if (PrintSharedSpaces) { |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
843 |
tty->print_cr("Shared spaces: preloaded %d classes", class_count); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
844 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
845 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
846 |
// Rewrite and link classes |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
847 |
tty->print_cr("Rewriting and linking classes ..."); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
848 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
849 |
// Link any classes which got missed. This would happen if we have loaded classes that |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
850 |
// were not explicitly specified in the classlist. E.g., if an interface implemented by class K |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
851 |
// fails verification, all other interfaces that were not specified in the classlist but |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
852 |
// are implemented by K are not verified. |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
853 |
link_and_cleanup_shared_classes(CATCH); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
854 |
tty->print_cr("Rewriting and linking classes: done"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
855 |
|
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
856 |
VMThread::execute(&op); |
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35231
diff
changeset
|
857 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
858 |
// Since various initialization steps have been undone by this process, |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
859 |
// it is not reasonable to continue running a java process. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
860 |
exit(0); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
861 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
862 |
|
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
863 |
|
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
864 |
int MetaspaceShared::preload_and_dump(const char* class_list_path, |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
865 |
GrowableArray<Klass*>* class_promote_order, |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
866 |
TRAPS) { |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
867 |
ClassListParser parser(class_list_path); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
868 |
int class_count = 0; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
869 |
|
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
870 |
while (parser.parse_one_line()) { |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
871 |
Klass* klass = ClassLoaderExt::load_one_class(&parser, THREAD); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
872 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
873 |
CLEAR_PENDING_EXCEPTION; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
874 |
if (klass != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
875 |
if (PrintSharedSpaces && Verbose && WizardMode) { |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
876 |
ResourceMark rm; |
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
877 |
tty->print_cr("Shared spaces preloaded: %s", klass->external_name()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
878 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
879 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
880 |
InstanceKlass* ik = InstanceKlass::cast(klass); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
881 |
|
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
36178
diff
changeset
|
882 |
// Should be class load order as per -Xlog:classload+preorder |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
883 |
class_promote_order->append(ik); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
884 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
885 |
// Link the class to cause the bytecodes to be rewritten and the |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
886 |
// cpcache to be created. The linking is done as soon as classes |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
887 |
// are loaded in order that the related data structures (klass and |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
888 |
// cpCache) are located together. |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
889 |
try_link_class(ik, THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
890 |
guarantee(!HAS_PENDING_EXCEPTION, "exception in link_class"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
891 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
892 |
class_count++; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
893 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
894 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
895 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
896 |
return class_count; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
897 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
898 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
899 |
// Returns true if the class's status has changed |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
900 |
bool MetaspaceShared::try_link_class(InstanceKlass* ik, TRAPS) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
901 |
assert(DumpSharedSpaces, "should only be called during dumping"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
902 |
if (ik->init_state() < InstanceKlass::linked) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
903 |
bool saved = BytecodeVerificationLocal; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
904 |
if (!SharedClassUtil::is_shared_boot_class(ik)) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
905 |
// The verification decision is based on BytecodeVerificationRemote |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
906 |
// for non-system classes. Since we are using the NULL classloader |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
907 |
// to load non-system classes during dumping, we need to temporarily |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
908 |
// change BytecodeVerificationLocal to be the same as |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
909 |
// BytecodeVerificationRemote. Note this can cause the parent system |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
910 |
// classes also being verified. The extra overhead is acceptable during |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
911 |
// dumping. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
912 |
BytecodeVerificationLocal = BytecodeVerificationRemote; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
913 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
914 |
ik->link_class(THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
915 |
if (HAS_PENDING_EXCEPTION) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
916 |
ResourceMark rm; |
27618
790a8bf5488b
8064375: Change certain errors to warnings in CDS output.
jiangli
parents:
27025
diff
changeset
|
917 |
tty->print_cr("Preload Warning: Verification failed for %s", |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
918 |
ik->external_name()); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
919 |
CLEAR_PENDING_EXCEPTION; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
920 |
ik->set_in_error_state(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
921 |
_has_error_classes = true; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
922 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
923 |
BytecodeVerificationLocal = saved; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
924 |
return true; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
925 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
926 |
return false; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
927 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
928 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
929 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
930 |
// Closure for serializing initialization data in from a data area |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
931 |
// (ptr_array) read from the shared file. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
932 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
933 |
class ReadClosure : public SerializeClosure { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
934 |
private: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
935 |
intptr_t** _ptr_array; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
936 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
937 |
inline intptr_t nextPtr() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
938 |
return *(*_ptr_array)++; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
939 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
940 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
941 |
public: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
942 |
ReadClosure(intptr_t** ptr_array) { _ptr_array = ptr_array; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
943 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
944 |
void do_ptr(void** p) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
945 |
assert(*p == NULL, "initializing previous initialized pointer."); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
946 |
intptr_t obj = nextPtr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
947 |
assert((intptr_t)obj >= 0 || (intptr_t)obj < -100, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
948 |
"hit tag while initializing ptrs."); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
949 |
*p = (void*)obj; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
950 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
951 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
952 |
void do_tag(int tag) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
953 |
int old_tag; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
954 |
old_tag = (int)(intptr_t)nextPtr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
955 |
// do_int(&old_tag); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
956 |
assert(tag == old_tag, "old tag doesn't match"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
957 |
FileMapInfo::assert_mark(tag == old_tag); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
958 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
959 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
960 |
void do_region(u_char* start, size_t size) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
961 |
assert((intptr_t)start % sizeof(intptr_t) == 0, "bad alignment"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
962 |
assert(size % sizeof(intptr_t) == 0, "bad size"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
963 |
do_tag((int)size); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
964 |
while (size > 0) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
965 |
*(intptr_t*)start = nextPtr(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
966 |
start += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
967 |
size -= sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
968 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
969 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
970 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
971 |
bool reading() const { return true; } |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
972 |
}; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
973 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
974 |
// Return true if given address is in the mapped shared space. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
975 |
bool MetaspaceShared::is_in_shared_space(const void* p) { |
18483
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
976 |
return UseSharedSpaces && FileMapInfo::current_info()->is_in_shared_space(p); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
977 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
978 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
979 |
bool MetaspaceShared::is_string_region(int idx) { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
980 |
return (idx >= MetaspaceShared::first_string && |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
981 |
idx < MetaspaceShared::first_string + MetaspaceShared::max_strings); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
982 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
983 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
984 |
void MetaspaceShared::print_shared_spaces() { |
18483
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
985 |
if (UseSharedSpaces) { |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
986 |
FileMapInfo::current_info()->print_shared_spaces(); |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
987 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
988 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
989 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
990 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
991 |
// Map shared spaces at requested addresses and return if succeeded. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
992 |
// Need to keep the bounds of the ro and rw space for the Metaspace::contains |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
993 |
// call, or is_in_shared_space. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
994 |
bool MetaspaceShared::map_shared_spaces(FileMapInfo* mapinfo) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
995 |
size_t image_alignment = mapinfo->alignment(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
996 |
|
15100
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
997 |
#ifndef _WINDOWS |
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
998 |
// Map in the shared memory and then map the regions on top of it. |
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
999 |
// On Windows, don't map the memory here because it will cause the |
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1000 |
// mappings of the regions to fail. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1001 |
ReservedSpace shared_rs = mapinfo->reserve_shared_memory(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1002 |
if (!shared_rs.is_reserved()) return false; |
15100
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1003 |
#endif |
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1004 |
|
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1005 |
assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1006 |
|
18483
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
1007 |
char* _ro_base = NULL; |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
1008 |
char* _rw_base = NULL; |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
1009 |
char* _md_base = NULL; |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
1010 |
char* _mc_base = NULL; |
c021907fa0a7
8016075: Win32 crash with CDS enabled and small heap size
iklam
parents:
17858
diff
changeset
|
1011 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1012 |
// Map each shared region |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1013 |
if ((_ro_base = mapinfo->map_region(ro)) != NULL && |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1014 |
mapinfo->verify_region_checksum(ro) && |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1015 |
(_rw_base = mapinfo->map_region(rw)) != NULL && |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1016 |
mapinfo->verify_region_checksum(rw) && |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1017 |
(_md_base = mapinfo->map_region(md)) != NULL && |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1018 |
mapinfo->verify_region_checksum(md) && |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1019 |
(_mc_base = mapinfo->map_region(mc)) != NULL && |
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1020 |
mapinfo->verify_region_checksum(mc) && |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1021 |
(image_alignment == (size_t)max_alignment()) && |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1022 |
mapinfo->validate_classpath_entry_table()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1023 |
// Success (no need to do anything) |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1024 |
return true; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1025 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1026 |
// If there was a failure in mapping any of the spaces, unmap the ones |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1027 |
// that succeeded |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1028 |
if (_ro_base != NULL) mapinfo->unmap_region(ro); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1029 |
if (_rw_base != NULL) mapinfo->unmap_region(rw); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1030 |
if (_md_base != NULL) mapinfo->unmap_region(md); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1031 |
if (_mc_base != NULL) mapinfo->unmap_region(mc); |
15100
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1032 |
#ifndef _WINDOWS |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1033 |
// Release the entire mapped region |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1034 |
shared_rs.release(); |
15100
0ae85ac7c8b0
8003705: CDS failed on Windows: can not map in the CDS.
hseigel
parents:
14488
diff
changeset
|
1035 |
#endif |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1036 |
// If -Xshare:on is specified, print out the error message and exit VM, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1037 |
// otherwise, set UseSharedSpaces to false and continue. |
28017
84009002b566
8066670: PrintSharedArchiveAndExit does not exit the VM when the archive is invalid
iklam
parents:
27619
diff
changeset
|
1038 |
if (RequireSharedSpaces || PrintSharedArchiveAndExit) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1039 |
vm_exit_during_initialization("Unable to use shared archive.", "Failed map_region for using -Xshare:on."); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1040 |
} else { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1041 |
FLAG_SET_DEFAULT(UseSharedSpaces, false); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1042 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1043 |
return false; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1044 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1045 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1046 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1047 |
// Read the miscellaneous data from the shared file, and |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1048 |
// serialize it out to its various destinations. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1049 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1050 |
void MetaspaceShared::initialize_shared_spaces() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1051 |
FileMapInfo *mapinfo = FileMapInfo::current_info(); |
35231 | 1052 |
char* buffer = mapinfo->misc_data_patching_start(); |
34257
4be3504cc03b
8140802: Clean up and refactor of class loading code for CDS
iklam
parents:
33638
diff
changeset
|
1053 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1054 |
// Skip over (reserve space for) a list of addresses of C++ vtables |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1055 |
// for Klass objects. They get filled in later. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1056 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1057 |
void** vtbl_list = (void**)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1058 |
buffer += MetaspaceShared::vtbl_list_size * sizeof(void*); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1059 |
Universe::init_self_patching_vtbl_list(vtbl_list, vtbl_list_size); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1060 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1061 |
// Skip over (reserve space for) dummy C++ vtables Klass objects. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1062 |
// They are used as is. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1063 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1064 |
intptr_t vtable_size = *(intptr_t*)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1065 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1066 |
buffer += vtable_size; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1067 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1068 |
// Create the shared symbol table using the compact table at this spot in the |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1069 |
// misc data space. (Todo: move this to read-only space. Currently |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1070 |
// this is mapped copy-on-write but will never be written into). |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1071 |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1072 |
buffer = (char*)SymbolTable::init_shared_table(buffer); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1073 |
SymbolTable::create_table(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1074 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1075 |
// Create the shared string table using the compact table |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1076 |
buffer = (char*)StringTable::init_shared_table(mapinfo, buffer); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1077 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1078 |
// Create the shared dictionary using the bucket array at this spot in |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1079 |
// the misc data space. Since the shared dictionary table is never |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1080 |
// modified, this region (of mapped pages) will be (effectively, if |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1081 |
// not explicitly) read-only. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1082 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1083 |
int sharedDictionaryLen = *(intptr_t*)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1084 |
buffer += sizeof(intptr_t); |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1085 |
int number_of_entries = *(intptr_t*)buffer; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1086 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1087 |
SystemDictionary::set_shared_dictionary((HashtableBucket<mtClass>*)buffer, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1088 |
sharedDictionaryLen, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1089 |
number_of_entries); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1090 |
buffer += sharedDictionaryLen; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1091 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1092 |
// Create the package info table using the bucket array at this spot in |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1093 |
// the misc data space. Since the package info table is never |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1094 |
// modified, this region (of mapped pages) will be (effectively, if |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1095 |
// not explicitly) read-only. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1096 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1097 |
int pkgInfoLen = *(intptr_t*)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1098 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1099 |
number_of_entries = *(intptr_t*)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1100 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1101 |
ClassLoader::create_package_info_table((HashtableBucket<mtClass>*)buffer, pkgInfoLen, |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1102 |
number_of_entries); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1103 |
buffer += pkgInfoLen; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1104 |
ClassLoader::verify(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1105 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1106 |
// The following data in the shared misc data region are the linked |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1107 |
// list elements (HashtableEntry objects) for the shared dictionary |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1108 |
// and package info table. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1109 |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
28017
diff
changeset
|
1110 |
int len = *(intptr_t*)buffer; // skip over shared dictionary entries |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1111 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1112 |
buffer += len; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1113 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1114 |
len = *(intptr_t*)buffer; // skip over package info table entries |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1115 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1116 |
buffer += len; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1117 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1118 |
len = *(intptr_t*)buffer; // skip over package info table char[] arrays. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1119 |
buffer += sizeof(intptr_t); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1120 |
buffer += len; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1121 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1122 |
intptr_t* array = (intptr_t*)buffer; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1123 |
ReadClosure rc(&array); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1124 |
serialize(&rc); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1125 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1126 |
// Close the mapinfo file |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1127 |
mapinfo->close(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1128 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1129 |
if (PrintSharedArchiveAndExit) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1130 |
if (PrintSharedDictionary) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1131 |
tty->print_cr("\nShared classes:\n"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1132 |
SystemDictionary::print_shared(false); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1133 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1134 |
if (_archive_loading_failed) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1135 |
tty->print_cr("archive is invalid"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1136 |
vm_exit(1); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1137 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1138 |
tty->print_cr("archive is valid"); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1139 |
vm_exit(0); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1140 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25468
diff
changeset
|
1141 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1142 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1143 |
|
31345
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1144 |
void MetaspaceShared::fixup_shared_string_regions() { |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1145 |
FileMapInfo *mapinfo = FileMapInfo::current_info(); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1146 |
mapinfo->fixup_string_regions(); |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1147 |
} |
1bba15125d8d
8015086: add interned strings to the shared archive.
jiangli
parents:
30773
diff
changeset
|
1148 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1149 |
// JVM/TI RedefineClasses() support: |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1150 |
bool MetaspaceShared::remap_shared_readonly_as_readwrite() { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1151 |
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1152 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1153 |
if (UseSharedSpaces) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1154 |
// remap the shared readonly space to shared readwrite, private |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1155 |
FileMapInfo* mapinfo = FileMapInfo::current_info(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1156 |
if (!mapinfo->remap_shared_readonly_as_readwrite()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1157 |
return false; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1158 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1159 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1160 |
return true; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
diff
changeset
|
1161 |
} |
26304
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1162 |
|
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1163 |
int MetaspaceShared::count_class(const char* classlist_file) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1164 |
if (classlist_file == NULL) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1165 |
return 0; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1166 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1167 |
char class_name[256]; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1168 |
int class_count = 0; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1169 |
FILE* file = fopen(classlist_file, "r"); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1170 |
if (file != NULL) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1171 |
while ((fgets(class_name, sizeof class_name, file)) != NULL) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1172 |
if (*class_name == '#') { // comment |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1173 |
continue; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1174 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1175 |
class_count++; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1176 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1177 |
fclose(file); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1178 |
} else { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1179 |
char errmsg[JVM_MAXPATHLEN]; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1180 |
os::lasterror(errmsg, JVM_MAXPATHLEN); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1181 |
tty->print_cr("Loading classlist failed: %s", errmsg); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1182 |
exit(1); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1183 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1184 |
|
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1185 |
return class_count; |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1186 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1187 |
|
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1188 |
// the sizes are good for typical large applications that have a lot of shared |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1189 |
// classes |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1190 |
void MetaspaceShared::estimate_regions_size() { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1191 |
int class_count = count_class(SharedClassListFile); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1192 |
class_count += count_class(ExtraSharedClassListFile); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1193 |
|
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1194 |
if (class_count > LargeThresholdClassCount) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1195 |
if (class_count < HugeThresholdClassCount) { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1196 |
SET_ESTIMATED_SIZE(Large, ReadOnly); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1197 |
SET_ESTIMATED_SIZE(Large, ReadWrite); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1198 |
SET_ESTIMATED_SIZE(Large, MiscData); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1199 |
SET_ESTIMATED_SIZE(Large, MiscCode); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1200 |
} else { |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1201 |
SET_ESTIMATED_SIZE(Huge, ReadOnly); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1202 |
SET_ESTIMATED_SIZE(Huge, ReadWrite); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1203 |
SET_ESTIMATED_SIZE(Huge, MiscData); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1204 |
SET_ESTIMATED_SIZE(Huge, MiscCode); |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1205 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1206 |
} |
a28e6335ce60
8048150: Allow easy configurations for large CDS archives
ccheung
parents:
26135
diff
changeset
|
1207 |
} |