mirrors
/
dcevm
mirror of https://github.com/dcevm/dcevm.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 31 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
166 Commits
4 Branches
Tree: 5d3ec9ec2a
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '5d3ec9ec2a'
${ noResults }
dcevm/hotspot/.hg/patches/light-jdk8u66-b17-deopt-cp....

light-jdk8u66-b17-deopt-cp.patch 9.9KB
Raw Blame History

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234 
  1. # HG changeset patch

  2. # Parent  5c1a815b73abcb755c43eb820f6557d37aeb4f9f

  3. 

  4. diff -r 5c1a815b73ab src/share/vm/classfile/classFileParser.cpp

  5. --- a/src/share/vm/classfile/classFileParser.cpp	Mon Dec 07 17:08:29 2015 -0800

  6. +++ b/src/share/vm/classfile/classFileParser.cpp	Mon Dec 07 17:11:00 2015 -0800

  7. @@ -4257,6 +4257,11 @@

  8.        }

  9.      }

  10.  

  11. +    if (cfs->source() != NULL && HotswapDeoptClassPath != NULL) {

  12. +      if (strstr(cfs->source(), HotswapDeoptClassPath) != NULL) 

  13. +        this_klass->set_deoptimization_incl(true);

  14. +    }

  15. +

  16.      if (TraceClassResolution) {

  17.        ResourceMark rm;

  18.        // print out the superclass.

  19. diff -r 5c1a815b73ab src/share/vm/classfile/systemDictionary.cpp

  20. --- a/src/share/vm/classfile/systemDictionary.cpp	Mon Dec 07 17:08:29 2015 -0800

  21. +++ b/src/share/vm/classfile/systemDictionary.cpp	Mon Dec 07 17:11:00 2015 -0800

  22. @@ -1245,6 +1245,11 @@

  23.        ik->restore_unshareable_info(loader_data, protection_domain, CHECK_(nh));

  24.      }

  25.  

  26. +    if (HotswapDeoptClassPath != NULL) {

  27. +      if (strstr(HotswapDeoptClassPath, ik->external_name()) != NULL)

  28. +        ik->set_deoptimization_incl(true);

  29. +    }

  30. +

  31.      if (TraceClassLoading) {

  32.        ResourceMark rm;

  33.        tty->print("[Loaded %s", ik->external_name());

  34. diff -r 5c1a815b73ab src/share/vm/code/codeCache.cpp

  35. --- a/src/share/vm/code/codeCache.cpp	Mon Dec 07 17:08:29 2015 -0800

  36. +++ b/src/share/vm/code/codeCache.cpp	Mon Dec 07 17:11:00 2015 -0800

  37. @@ -707,6 +707,13 @@

  38.  }

  39.  #endif // HOTSWAP

  40.  

  41. +// Deoptimize all methods having deopt-include flag

  42. +void CodeCache::mark_all_incl_nmethods_for_deoptimization() {

  43. +  MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);

  44. +  FOR_ALL_ALIVE_NMETHODS(nm) {

  45. +    nm->mark_for_deoptimization_incl();

  46. +  }

  47. +}

  48.  

  49.  // Deoptimize all methods

  50.  void CodeCache::mark_all_nmethods_for_deoptimization() {

  51. diff -r 5c1a815b73ab src/share/vm/code/codeCache.hpp

  52. --- a/src/share/vm/code/codeCache.hpp	Mon Dec 07 17:08:29 2015 -0800

  53. +++ b/src/share/vm/code/codeCache.hpp	Mon Dec 07 17:11:00 2015 -0800

  54. @@ -185,6 +185,7 @@

  55.      // tells how many nmethods have dependencies

  56.    static int number_of_nmethods_with_dependencies();

  57.  

  58. +  static void mark_all_incl_nmethods_for_deoptimization();

  59.    static int get_codemem_full_count() { return _codemem_full_count; }

  60.  };

  61.  

  62. diff -r 5c1a815b73ab src/share/vm/code/nmethod.cpp

  63. --- a/src/share/vm/code/nmethod.cpp	Mon Dec 07 17:08:29 2015 -0800

  64. +++ b/src/share/vm/code/nmethod.cpp	Mon Dec 07 17:11:00 2015 -0800

  65. @@ -476,6 +476,7 @@

  66.    _lazy_critical_native       = 0;

  67.    _has_wide_vectors           = 0;

  68.    _marked_for_deoptimization  = 0;

  69. +  _deoptimization_incl        = false;

  70.    _lock_count                 = 0;

  71.    _stack_traversal_mark       = 0;

  72.    _unload_reported            = false;           // jvmti state

  73. @@ -688,6 +689,7 @@

  74.      _dependencies_offset     = _scopes_pcs_offset;

  75.      _handler_table_offset    = _dependencies_offset;

  76.      _nul_chk_table_offset    = _handler_table_offset;

  77. +

  78.      _nmethod_end_offset      = _nul_chk_table_offset;

  79.      _compile_id              = compile_id;

  80.      _comp_level              = CompLevel_none;

  81. @@ -697,6 +699,8 @@

  82.      _exception_cache         = NULL;

  83.      _pc_desc_cache.reset_to(NULL);

  84.      _hotness_counter         = NMethodSweeper::hotness_counter_reset_val();

  85. +    if (method != NULL)

  86. +      _deoptimization_incl = method->method_holder()->is_deoptimization_incl();

  87.  

  88.      code_buffer->copy_values_to(this);

  89.      if (ScavengeRootsInCode) {

  90. @@ -772,6 +776,7 @@

  91.      _metadata_offset         = _oops_offset         + round_to(code_buffer->total_oop_size(), oopSize);

  92.      _scopes_data_offset      = _metadata_offset     + round_to(code_buffer->total_metadata_size(), wordSize);

  93.      _scopes_pcs_offset       = _scopes_data_offset;

  94. +

  95.      _dependencies_offset     = _scopes_pcs_offset;

  96.      _handler_table_offset    = _dependencies_offset;

  97.      _nul_chk_table_offset    = _handler_table_offset;

  98. @@ -784,6 +789,8 @@

  99.      _exception_cache         = NULL;

  100.      _pc_desc_cache.reset_to(NULL);

  101.      _hotness_counter         = NMethodSweeper::hotness_counter_reset_val();

  102. +    if (method != NULL)

  103. +      _deoptimization_incl = method->method_holder()->is_deoptimization_incl();

  104.  

  105.      code_buffer->copy_values_to(this);

  106.      if (ScavengeRootsInCode) {

  107. @@ -900,6 +907,9 @@

  108.      _exception_cache         = NULL;

  109.      _pc_desc_cache.reset_to(scopes_pcs_begin());

  110.  

  111. +    if (method != NULL)

  112. +      _deoptimization_incl = method->method_holder()->is_deoptimization_incl();

  113. +

  114.      // Copy contents of ScopeDescRecorder to nmethod

  115.      code_buffer->copy_values_to(this);

  116.      debug_info->copy_to(this);

  117. diff -r 5c1a815b73ab src/share/vm/code/nmethod.hpp

  118. --- a/src/share/vm/code/nmethod.hpp	Mon Dec 07 17:08:29 2015 -0800

  119. +++ b/src/share/vm/code/nmethod.hpp	Mon Dec 07 17:11:00 2015 -0800

  120. @@ -184,6 +184,8 @@

  121.    bool _marked_for_reclamation;              // Used by NMethodSweeper (set only by sweeper)

  122.    bool _marked_for_deoptimization;           // Used for stack deoptimization

  123.  

  124. +  bool _deoptimization_incl;

  125. +

  126.    // used by jvmti to track if an unload event has been posted for this nmethod.

  127.    bool _unload_reported;

  128.  

  129. @@ -470,6 +472,11 @@

  130.    bool  is_marked_for_deoptimization() const      { return _marked_for_deoptimization; }

  131.    void  mark_for_deoptimization()                 { _marked_for_deoptimization = true; }

  132.  

  133. +  bool  is_deoptimization_incl() const            { return _deoptimization_incl; }

  134. +  void  set_deoptimization_incl(bool z)           { _deoptimization_incl = z; }

  135. +

  136. +  void  mark_for_deoptimization_incl()            { if (_deoptimization_incl) _marked_for_deoptimization = true; }

  137. +

  138.    void  make_unloaded(BoolObjectClosure* is_alive, oop cause);

  139.  

  140.    bool has_dependencies()                         { return dependencies_size() != 0; }

  141. diff -r 5c1a815b73ab src/share/vm/oops/klass.cpp

  142. --- a/src/share/vm/oops/klass.cpp	Mon Dec 07 17:08:29 2015 -0800

  143. +++ b/src/share/vm/oops/klass.cpp	Mon Dec 07 17:11:00 2015 -0800

  144. @@ -188,6 +188,7 @@

  145.  

  146.    set_redefinition_flags(Klass::NoRedefinition);

  147.    set_redefining(false);

  148. +  set_deoptimization_incl(false);

  149.    set_new_version(NULL);

  150.    set_old_version(NULL);

  151.    set_redefinition_index(-1);

  152. @@ -236,6 +237,8 @@

  153.    if (FastSuperclassLimit == 0) {

  154.      // None of the other machinery matters.

  155.      set_super(k);

  156. +    if (k != NULL && k->is_deoptimization_incl())

  157. +      set_deoptimization_incl(true);

  158.      return;

  159.    }

  160.    if (k == NULL) {

  161. @@ -247,6 +250,8 @@

  162.             "initialize this only once to a non-trivial value");

  163.      set_super(k);

  164.      Klass* sup = k;

  165. +    if (sup->is_deoptimization_incl())

  166. +      set_deoptimization_incl(true);

  167.      int sup_depth = sup->super_depth();

  168.      juint my_depth  = MIN2(sup_depth + 1, (int)primary_super_limit());

  169.      if (!can_be_primary_super_slow())

  170. diff -r 5c1a815b73ab src/share/vm/oops/klass.hpp

  171. --- a/src/share/vm/oops/klass.hpp	Mon Dec 07 17:08:29 2015 -0800

  172. +++ b/src/share/vm/oops/klass.hpp	Mon Dec 07 17:11:00 2015 -0800

  173. @@ -177,6 +177,7 @@

  174.    bool        _original_field_offsets_changed; // Did the original field offsets of this class change during class redefinition?

  175.    int *       _update_information;     // Update information

  176.    bool        _is_redefining;

  177. +  bool        _deoptimization_incl; // True if class methods are included in deoptimization

  178.  

  179.    // Biased locking implementation and statistics

  180.    // (the 64-bit chunk goes first, to avoid some fragmentation)

  181. @@ -263,6 +264,9 @@

  182.    int *update_information() const                      { return _update_information; }

  183.    void set_update_information(int *info)               { _update_information = info; }

  184.  

  185. +  bool  is_deoptimization_incl() const                 { return _deoptimization_incl; }

  186. +  void  set_deoptimization_incl(bool z)                { _deoptimization_incl = z; }

  187. +

  188.    // Revision number for redefined classes, -1 for originally loaded classes

  189.    bool was_redefined() const            { return _revision_number != -1; }

  190.    jint revision_number() const          { return _revision_number; }

  191. diff -r 5c1a815b73ab src/share/vm/prims/jvmtiRedefineClasses2.cpp

  192. --- a/src/share/vm/prims/jvmtiRedefineClasses2.cpp	Mon Dec 07 17:08:29 2015 -0800

  193. +++ b/src/share/vm/prims/jvmtiRedefineClasses2.cpp	Mon Dec 07 17:11:00 2015 -0800

  194. @@ -443,6 +443,8 @@

  195.  

  196.      new_class->set_redefinition_flags(redefinition_flags);

  197.  

  198. +    new_class->set_deoptimization_incl(true);

  199. +

  200.      _max_redefinition_flags = _max_redefinition_flags | redefinition_flags;

  201.  

  202.      if ((redefinition_flags & Klass::ModifyInstances) != 0) {

  203. @@ -1568,7 +1570,10 @@

  204.    if (0 && JvmtiExport::all_dependencies_are_recorded()) {

  205.      Universe::flush_evol_dependents_on(k_h);

  206.    } else {

  207. -    CodeCache::mark_all_nmethods_for_deoptimization();

  208. +  	if (HotswapDeoptClassPath == NULL)

  209. +  		CodeCache::mark_all_nmethods_for_deoptimization();

  210. +  	else

  211. +    	CodeCache::mark_all_incl_nmethods_for_deoptimization();

  212.  

  213.      ResourceMark rm(THREAD);

  214.      DeoptimizationMarker dm;

  215. diff -r 5c1a815b73ab src/share/vm/runtime/globals.hpp

  216. --- a/src/share/vm/runtime/globals.hpp	Mon Dec 07 17:08:29 2015 -0800

  217. +++ b/src/share/vm/runtime/globals.hpp	Mon Dec 07 17:11:00 2015 -0800

  218. @@ -3947,7 +3947,15 @@

  219.                                                                              \

  220.    product_pd(bool, PreserveFramePointer,                                    \

  221.               "Use the FP register for holding the frame pointer "           \

  222. -             "and not as a general purpose register.")

  223. +             "and not as a general purpose register.")                      \

  224. +                                                                            \

  225. +  product(ccstr, HotswapDeoptClassPath, NULL,                               \

  226. +          "Class path or fragment of the class path to a folder with "      \

  227. +          "classes allowed to be deoptimized on hotswap. If is not "        \

  228. +          "defined then all classes will be deoptimized on hotswap. "       \

  229. +          "That's default behaviour. Using this option the performance "    \

  230. +          "of hotswap can be considerably increased. ")

  231. +

  232.  

  233.  /*

  234.   *  Macros for factoring of globals