From 7d49f478c395864cb6fe06ecf838e25729cb01f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Dvo=3F=C3=A1k?= Date: Wed, 2 Jul 2014 22:33:18 +0200 Subject: [PATCH] light-jdk7u51 deopt-cp patch. Indentation fix. --- .../.hg/patches/full-jdk7u45-deopt-cp.patch | 24 +- .../.hg/patches/full-jdk7u51-deopt-cp.patch | 22 +- .../.hg/patches/light-jdk7u51-deopt-cp.patch | 225 ++++++++++++++++++ hotspot/.hg/patches/series | 1 + 4 files changed, 243 insertions(+), 29 deletions(-) create mode 100644 hotspot/.hg/patches/light-jdk7u51-deopt-cp.patch diff --git a/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch b/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch index eb770b6b..432a83ab 100644 --- a/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch +++ b/hotspot/.hg/patches/full-jdk7u45-deopt-cp.patch @@ -1,36 +1,30 @@ diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp -index a6d138b..f7e4e81 100644 +index 4ea4e2b..03e3e68 100644 --- a/src/share/vm/classfile/classFileParser.cpp +++ b/src/share/vm/classfile/classFileParser.cpp -@@ -3942,6 +3942,14 @@ +@@ -3942,6 +3942,11 @@ } } -+ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) -+ { ++ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) { + if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) -+ { + this_klass->set_deoptimization_incl(true); -+ } + } + if (TraceClassResolution) { // print out the superclass. const char * from = Klass::cast(this_klass())->external_name(); diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp -index fa45c6d..a28504d 100644 +index fa45c6d..6de52ce 100644 --- a/src/share/vm/classfile/systemDictionary.cpp +++ b/src/share/vm/classfile/systemDictionary.cpp -@@ -1255,6 +1255,14 @@ +@@ -1255,6 +1255,11 @@ } } -+ if (HotswapDeoptClassPath != NULL) -+ { ++ if (HotswapDeoptClassPath != NULL) { + if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) -+ { + ik->set_deoptimization_incl(true); -+ } + } + if (TraceClassLoading) { @@ -200,7 +194,7 @@ index d086b5d..0719b90 100644 jint revision_number() const { return _revision_number; diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp -index ef4f380..5d2382c 100644 +index 640e7da..a20cea2 100644 --- a/src/share/vm/prims/jvmtiRedefineClasses.cpp +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp @@ -435,6 +435,8 @@ @@ -236,7 +230,7 @@ index ef4f380..5d2382c 100644 ResourceMark rm(THREAD); DeoptimizationMarker dm; diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp -index 634c589..eeb0558 100644 +index 634c589..5ccc302 100644 --- a/src/share/vm/runtime/globals.hpp +++ b/src/share/vm/runtime/globals.hpp @@ -3659,7 +3659,13 @@ @@ -250,7 +244,7 @@ index 634c589..eeb0558 100644 + "classes allowed to be deoptimized on hotswap. If is not " \ + "defined then all classes will be deoptimized on hotswap. " \ + "That's default behaviour. Using this option the performance " \ -+ "of hotswap can considerably increased. ") ++ "of hotswap can be considerably increased. ") /* * Macros for factoring of globals \ No newline at end of file diff --git a/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch b/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch index eb770b6b..3b551f63 100644 --- a/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch +++ b/hotspot/.hg/patches/full-jdk7u51-deopt-cp.patch @@ -1,36 +1,30 @@ diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp -index a6d138b..f7e4e81 100644 +index a6d138b..731c75b 100644 --- a/src/share/vm/classfile/classFileParser.cpp +++ b/src/share/vm/classfile/classFileParser.cpp -@@ -3942,6 +3942,14 @@ +@@ -3942,6 +3942,11 @@ } } -+ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) -+ { ++ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) { + if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) -+ { + this_klass->set_deoptimization_incl(true); -+ } + } + if (TraceClassResolution) { // print out the superclass. const char * from = Klass::cast(this_klass())->external_name(); diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp -index fa45c6d..a28504d 100644 +index fa45c6d..6de52ce 100644 --- a/src/share/vm/classfile/systemDictionary.cpp +++ b/src/share/vm/classfile/systemDictionary.cpp -@@ -1255,6 +1255,14 @@ +@@ -1255,6 +1255,11 @@ } } -+ if (HotswapDeoptClassPath != NULL) -+ { ++ if (HotswapDeoptClassPath != NULL) { + if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) -+ { + ik->set_deoptimization_incl(true); -+ } + } + if (TraceClassLoading) { @@ -236,7 +230,7 @@ index ef4f380..5d2382c 100644 ResourceMark rm(THREAD); DeoptimizationMarker dm; diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp -index 634c589..eeb0558 100644 +index 634c589..5ccc302 100644 --- a/src/share/vm/runtime/globals.hpp +++ b/src/share/vm/runtime/globals.hpp @@ -3659,7 +3659,13 @@ @@ -250,7 +244,7 @@ index 634c589..eeb0558 100644 + "classes allowed to be deoptimized on hotswap. If is not " \ + "defined then all classes will be deoptimized on hotswap. " \ + "That's default behaviour. Using this option the performance " \ -+ "of hotswap can considerably increased. ") ++ "of hotswap can be considerably increased. ") /* * Macros for factoring of globals \ No newline at end of file diff --git a/hotspot/.hg/patches/light-jdk7u51-deopt-cp.patch b/hotspot/.hg/patches/light-jdk7u51-deopt-cp.patch new file mode 100644 index 00000000..7df3297b --- /dev/null +++ b/hotspot/.hg/patches/light-jdk7u51-deopt-cp.patch @@ -0,0 +1,225 @@ +diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp +index 8590ad1..7e35b1a 100644 +--- a/src/share/vm/classfile/classFileParser.cpp ++++ b/src/share/vm/classfile/classFileParser.cpp +@@ -3798,6 +3798,11 @@ + } + } + ++ if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) { ++ if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) ++ this_klass->set_deoptimization_incl(true); ++ } ++ + if (TraceClassResolution) { + // print out the superclass. + const char * from = Klass::cast(this_klass())->external_name(); +diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp +index 3f64268..124c39c 100644 +--- a/src/share/vm/classfile/systemDictionary.cpp ++++ b/src/share/vm/classfile/systemDictionary.cpp +@@ -1256,6 +1256,11 @@ + } + } + ++ if (HotswapDeoptClassPath != NULL) { ++ if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL) ++ ik->set_deoptimization_incl(true); ++ } ++ + if (TraceClassLoading) { + ResourceMark rm; + tty->print("[Loaded %s", ik->external_name()); +diff --git a/src/share/vm/code/codeCache.cpp b/src/share/vm/code/codeCache.cpp +index 70574bc..722ecfd 100644 +--- a/src/share/vm/code/codeCache.cpp ++++ b/src/share/vm/code/codeCache.cpp +@@ -713,6 +713,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 --git a/src/share/vm/code/codeCache.hpp b/src/share/vm/code/codeCache.hpp +index a670805..0206b48 100644 +--- a/src/share/vm/code/codeCache.hpp ++++ b/src/share/vm/code/codeCache.hpp +@@ -186,6 +186,7 @@ + #endif // HOTSWAP + + static void mark_all_nmethods_for_deoptimization(); ++ static void mark_all_incl_nmethods_for_deoptimization(); + static int mark_for_deoptimization(methodOop dependee); + static void make_marked_nmethods_zombies(); + static void make_marked_nmethods_not_entrant(); +diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp +index 59f5f7e..b7d0742 100644 +--- a/src/share/vm/code/nmethod.cpp ++++ b/src/share/vm/code/nmethod.cpp +@@ -465,6 +465,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 +@@ -673,6 +674,9 @@ + _exception_cache = NULL; + _pc_desc_cache.reset_to(NULL); + ++ if (method != NULL) ++ _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl(); ++ + code_buffer->copy_oops_to(this); + if (ScavengeRootsInCode && detect_scavenge_root_oops()) { + CodeCache::add_scavenge_root_nmethod(this); +@@ -754,6 +758,9 @@ + _osr_entry_point = NULL; + _exception_cache = NULL; + _pc_desc_cache.reset_to(NULL); ++ ++ if (method != NULL) ++ _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl(); + + code_buffer->copy_oops_to(this); + debug_only(verify_scavenge_root_oops()); +@@ -863,6 +870,9 @@ + _exception_cache = NULL; + _pc_desc_cache.reset_to(scopes_pcs_begin()); + ++ if (method != NULL) ++ _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl(); ++ + // Copy contents of ScopeDescRecorder to nmethod + code_buffer->copy_oops_to(this); + debug_info->copy_to(this); +diff --git a/src/share/vm/code/nmethod.hpp b/src/share/vm/code/nmethod.hpp +index 8d76afb..d2d1acc 100644 +--- a/src/share/vm/code/nmethod.hpp ++++ b/src/share/vm/code/nmethod.hpp +@@ -169,6 +169,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; + +@@ -412,6 +414,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 --git a/src/share/vm/oops/klass.cpp b/src/share/vm/oops/klass.cpp +index a928777..d3714b7 100644 +--- a/src/share/vm/oops/klass.cpp ++++ b/src/share/vm/oops/klass.cpp +@@ -163,6 +163,7 @@ + + kl->set_redefinition_flags(Klass::NoRedefinition); + kl->set_redefining(false); ++ kl->set_deoptimization_incl(false); + kl->set_new_version(NULL); + kl->set_old_version(NULL); + kl->set_redefinition_index(-1); +@@ -233,6 +234,8 @@ + if (FastSuperclassLimit == 0) { + // None of the other machinery matters. + set_super(k); ++ if (k != NULL && k->klass_part()->is_deoptimization_incl()) ++ set_deoptimization_incl(true); + return; + } + if (k == NULL) { +@@ -244,6 +247,8 @@ + "initialize this only once to a non-trivial value"); + set_super(k); + Klass* sup = k->klass_part(); ++ 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 --git a/src/share/vm/oops/klass.hpp b/src/share/vm/oops/klass.hpp +index bf242d9..884deae 100644 +--- a/src/share/vm/oops/klass.hpp ++++ b/src/share/vm/oops/klass.hpp +@@ -292,6 +292,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 + + #ifndef PRODUCT + int _verify_count; // to avoid redundant verifies +@@ -376,6 +377,9 @@ + else { return _old_version->klass_part()->is_same_or_older_version(klass); } + } + ++ 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 + jint revision_number() const { + return _revision_number; +diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp +index cb90823..6836fae 100644 +--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp ++++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp +@@ -482,6 +482,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) { +@@ -1857,7 +1859,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 --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp +index 341b399..1e8b1b0 100644 +--- a/src/share/vm/runtime/globals.hpp ++++ b/src/share/vm/runtime/globals.hpp +@@ -3650,7 +3650,13 @@ + product(bool, EnableTracing, false, \ + "Enable event-based tracing") \ + product(bool, UseLockedTracing, false, \ +- "Use locked-tracing when doing event-based tracing") ++ "Use locked-tracing when doing event-based tracing") \ ++ product(ccstr, HotswapDeoptClassPath, NULL, \ ++ "Class path or fragment of the class path to a folder with " \ ++ "classes allowed to be deoptimized on hotswap. If is not " \ ++ "defined then all classes will be deoptimized on hotswap. " \ ++ "That's default behaviour. Using this option the performance " \ ++ "of hotswap can be considerably increased. ") + + /* + * Macros for factoring of globals \ No newline at end of file diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series index 35ed7db1..1793cc29 100644 --- a/hotspot/.hg/patches/series +++ b/hotspot/.hg/patches/series @@ -19,3 +19,4 @@ light-jdk7u51-b13.patch #+light-jdk7u51-b13 #+light-jdk7u55-b13 light-jdk8u5-b13.patch #+light-jdk8u5-b13 full-jdk7u45-deopt-cp.patch #+full-jdk7u45-b08 full-jdk7u51-deopt-cp.patch #+full-jdk7u51-b13 +light-jdk7u51-deopt-cp.patch #+light-jdk7u51-b13 -- 2.39.5