1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
|
# HG changeset patch
# Parent ae559120fec5645d5f89c6aee6704c64707ccec5
diff -r ae559120fec5 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -4264,6 +4264,30 @@
}
}
+ if (this_klass->external_name() != NULL && HotswapDeoptClassPath != NULL) {
+ const char* deopt_path = HotswapDeoptClassPath;
+ const char* const end = deopt_path + strlen(deopt_path);
+ bool deopt_found = false;
+ while (!deopt_found && deopt_path < end) {
+ const char* tmp_end = strchr(deopt_path, ',');
+ if (tmp_end == NULL) {
+ tmp_end = end;
+ }
+ char* deopt_segm_path = NEW_C_HEAP_ARRAY(char, tmp_end - deopt_path + 1, mtInternal);
+ memcpy(deopt_segm_path, deopt_path, tmp_end - deopt_path);
+ deopt_segm_path[tmp_end - deopt_path] = '\0';
+ if (strstr(this_klass->external_name(), deopt_segm_path) != NULL) {
+ if (TraceRedefineClasses > 0) {
+ tty->print_cr("Including in deoptimization : %s", this_klass->external_name());
+ }
+ this_klass->set_deoptimization_incl(true);
+ deopt_found = true;
+ }
+ FREE_C_HEAP_ARRAY(char, deopt_segm_path, mtInternal);
+ deopt_path = tmp_end + 1;
+ }
+ }
+
if (TraceClassResolution) {
ResourceMark rm;
// print out the superclass.
diff -r ae559120fec5 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/classfile/systemDictionary.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -1255,6 +1255,31 @@
ik->restore_unshareable_info(loader_data, protection_domain, CHECK_(nh));
}
+ if (HotswapDeoptClassPath != NULL) {
+ const char* deopt_path = HotswapDeoptClassPath;
+ const char* const end = deopt_path + strlen(deopt_path);
+ bool deopt_found = false;
+ while (!deopt_found && deopt_path < end) {
+ const char* tmp_end = strchr(deopt_path, ',');
+ if (tmp_end == NULL) {
+ tmp_end = end;
+ }
+ char* deopt_segm_path = NEW_C_HEAP_ARRAY(char, tmp_end - deopt_path + 1, mtInternal);
+ memcpy(deopt_segm_path, deopt_path, tmp_end - deopt_path);
+ deopt_segm_path[tmp_end - deopt_path] = '\0';
+ if (strstr(ik->external_name(), deopt_segm_path) != NULL) {
+ if (TraceRedefineClasses > 0) {
+ tty->print_cr("Including in deoptimization : %s", ik->external_name());
+ }
+ ik->set_deoptimization_incl(true);
+ deopt_found = true;
+ }
+ FREE_C_HEAP_ARRAY(char, deopt_segm_path, mtInternal);
+ deopt_path = tmp_end + 1;
+ }
+ }
+
+
if (TraceClassLoading) {
ResourceMark rm;
tty->print("[Loaded %s", ik->external_name());
diff -r ae559120fec5 src/share/vm/code/codeCache.cpp
--- a/src/share/vm/code/codeCache.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/code/codeCache.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -709,6 +709,13 @@
}
#endif // HOTSWAP
+// Deoptimize all methods having deopt-include flag
+void CodeCache::mark_all_incl_nmethods_for_deoptimization() {
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ FOR_ALL_ALIVE_NMETHODS(nm) {
+ nm->mark_for_deoptimization_incl();
+ }
+}
// Deoptimize all methods
void CodeCache::mark_all_nmethods_for_deoptimization() {
diff -r ae559120fec5 src/share/vm/code/codeCache.hpp
--- a/src/share/vm/code/codeCache.hpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/code/codeCache.hpp Sat Jul 08 13:28:02 2017 -0500
@@ -184,6 +184,7 @@
// tells how many nmethods have dependencies
static int number_of_nmethods_with_dependencies();
+ static void mark_all_incl_nmethods_for_deoptimization();
static int get_codemem_full_count() { return _codemem_full_count; }
};
diff -r ae559120fec5 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/code/nmethod.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -476,6 +476,7 @@
_lazy_critical_native = 0;
_has_wide_vectors = 0;
_marked_for_deoptimization = 0;
+ _deoptimization_incl = false;
_lock_count = 0;
_stack_traversal_mark = 0;
_unload_reported = false; // jvmti state
@@ -688,6 +689,7 @@
_dependencies_offset = _scopes_pcs_offset;
_handler_table_offset = _dependencies_offset;
_nul_chk_table_offset = _handler_table_offset;
+
_nmethod_end_offset = _nul_chk_table_offset;
_compile_id = compile_id;
_comp_level = CompLevel_none;
@@ -697,6 +699,8 @@
_exception_cache = NULL;
_pc_desc_cache.reset_to(NULL);
_hotness_counter = NMethodSweeper::hotness_counter_reset_val();
+ if (method != NULL)
+ _deoptimization_incl = method->method_holder()->is_deoptimization_incl();
code_buffer->copy_values_to(this);
if (ScavengeRootsInCode) {
@@ -772,6 +776,7 @@
_metadata_offset = _oops_offset + round_to(code_buffer->total_oop_size(), oopSize);
_scopes_data_offset = _metadata_offset + round_to(code_buffer->total_metadata_size(), wordSize);
_scopes_pcs_offset = _scopes_data_offset;
+
_dependencies_offset = _scopes_pcs_offset;
_handler_table_offset = _dependencies_offset;
_nul_chk_table_offset = _handler_table_offset;
@@ -784,6 +789,8 @@
_exception_cache = NULL;
_pc_desc_cache.reset_to(NULL);
_hotness_counter = NMethodSweeper::hotness_counter_reset_val();
+ if (method != NULL)
+ _deoptimization_incl = method->method_holder()->is_deoptimization_incl();
code_buffer->copy_values_to(this);
if (ScavengeRootsInCode) {
@@ -900,6 +907,9 @@
_exception_cache = NULL;
_pc_desc_cache.reset_to(scopes_pcs_begin());
+ if (method != NULL)
+ _deoptimization_incl = method->method_holder()->is_deoptimization_incl();
+
// Copy contents of ScopeDescRecorder to nmethod
code_buffer->copy_values_to(this);
debug_info->copy_to(this);
diff -r ae559120fec5 src/share/vm/code/nmethod.hpp
--- a/src/share/vm/code/nmethod.hpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/code/nmethod.hpp Sat Jul 08 13:28:02 2017 -0500
@@ -184,6 +184,8 @@
bool _marked_for_reclamation; // Used by NMethodSweeper (set only by sweeper)
bool _marked_for_deoptimization; // Used for stack deoptimization
+ bool _deoptimization_incl;
+
// used by jvmti to track if an unload event has been posted for this nmethod.
bool _unload_reported;
@@ -470,6 +472,11 @@
bool is_marked_for_deoptimization() const { return _marked_for_deoptimization; }
void mark_for_deoptimization() { _marked_for_deoptimization = true; }
+ bool is_deoptimization_incl() const { return _deoptimization_incl; }
+ void set_deoptimization_incl(bool z) { _deoptimization_incl = z; }
+
+ void mark_for_deoptimization_incl() { if (_deoptimization_incl) _marked_for_deoptimization = true; }
+
void make_unloaded(BoolObjectClosure* is_alive, oop cause);
bool has_dependencies() { return dependencies_size() != 0; }
diff -r ae559120fec5 src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -222,7 +222,7 @@
((HeapWord *)new_location >= (HeapWord *)q && (HeapWord *)new_location < (HeapWord *)q + size)) {
tmp = NEW_RESOURCE_ARRAY(HeapWord, size);
q = (oop) tmp;
- Copy::aligned_disjoint_words((HeapWord*)q, (HeapWord*)tmp_obj, size);
+ Copy::aligned_disjoint_words((HeapWord*)tmp_obj, (HeapWord*)q, size);
}
}
diff -r ae559120fec5 src/share/vm/memory/genMarkSweep.cpp
--- a/src/share/vm/memory/genMarkSweep.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/memory/genMarkSweep.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -333,8 +333,6 @@
GCTraceTime tm("phase 4", PrintGC && Verbose, true, _gc_timer, _gc_tracer->gc_id());
trace("4");
- MarkSweep::copy_rescued_objects_back();
-
GenCompactClosure blk;
gch->generation_iterate(&blk, true);
diff -r ae559120fec5 src/share/vm/oops/klass.cpp
--- a/src/share/vm/oops/klass.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/oops/klass.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -188,6 +188,7 @@
set_redefinition_flags(Klass::NoRedefinition);
set_redefining(false);
+ set_deoptimization_incl(false);
set_new_version(NULL);
set_old_version(NULL);
set_redefinition_index(-1);
@@ -236,6 +237,8 @@
if (FastSuperclassLimit == 0) {
// None of the other machinery matters.
set_super(k);
+ if (k != NULL && k->is_deoptimization_incl())
+ set_deoptimization_incl(true);
return;
}
if (k == NULL) {
@@ -247,6 +250,8 @@
"initialize this only once to a non-trivial value");
set_super(k);
Klass* sup = k;
+ if (sup->is_deoptimization_incl())
+ set_deoptimization_incl(true);
int sup_depth = sup->super_depth();
juint my_depth = MIN2(sup_depth + 1, (int)primary_super_limit());
if (!can_be_primary_super_slow())
diff -r ae559120fec5 src/share/vm/oops/klass.hpp
--- a/src/share/vm/oops/klass.hpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/oops/klass.hpp Sat Jul 08 13:28:02 2017 -0500
@@ -177,6 +177,7 @@
bool _original_field_offsets_changed; // Did the original field offsets of this class change during class redefinition?
int * _update_information; // Update information
bool _is_redefining;
+ bool _deoptimization_incl; // True if class methods are included in deoptimization
// Biased locking implementation and statistics
// (the 64-bit chunk goes first, to avoid some fragmentation)
@@ -263,6 +264,9 @@
int *update_information() const { return _update_information; }
void set_update_information(int *info) { _update_information = info; }
+ bool is_deoptimization_incl() const { return _deoptimization_incl; }
+ void set_deoptimization_incl(bool z) { _deoptimization_incl = z; }
+
// Revision number for redefined classes, -1 for originally loaded classes
bool was_redefined() const { return _revision_number != -1; }
jint revision_number() const { return _revision_number; }
diff -r ae559120fec5 src/share/vm/prims/jvmtiRedefineClasses2.cpp
--- a/src/share/vm/prims/jvmtiRedefineClasses2.cpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp Sat Jul 08 13:28:02 2017 -0500
@@ -443,6 +443,8 @@
new_class->set_redefinition_flags(redefinition_flags);
+ new_class->set_deoptimization_incl(true);
+
_max_redefinition_flags = _max_redefinition_flags | redefinition_flags;
if ((redefinition_flags & Klass::ModifyInstances) != 0) {
@@ -1579,7 +1581,10 @@
if (0 && JvmtiExport::all_dependencies_are_recorded()) {
Universe::flush_evol_dependents_on(k_h);
} else {
- CodeCache::mark_all_nmethods_for_deoptimization();
+ if (HotswapDeoptClassPath == NULL)
+ CodeCache::mark_all_nmethods_for_deoptimization();
+ else
+ CodeCache::mark_all_incl_nmethods_for_deoptimization();
ResourceMark rm(THREAD);
DeoptimizationMarker dm;
diff -r ae559120fec5 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp Thu Apr 27 18:12:53 2017 -0700
+++ b/src/share/vm/runtime/globals.hpp Sat Jul 08 13:28:02 2017 -0500
@@ -3962,7 +3962,16 @@
\
product_pd(bool, PreserveFramePointer, \
"Use the FP register for holding the frame pointer " \
- "and not as a general purpose register.")
+ "and not as a general purpose register.") \
+ \
+ product(ccstr, HotswapDeoptClassPath, NULL, \
+ "Comma separated list of packages containing classes that are " \
+ "expected to be redefined. If com.sun.proxy is used by " \
+ "application and proxied class is redefined, then this option " \
+ "should contain 'com.sun.proxy'. If the option is not defined, " \
+ "then all classes will be deoptimized on hotswap. Using this " \
+ "option improves hotswap performance. ")
+
/*
* Macros for factoring of globals
|
