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.
89 Commits
4 Branches
Tree: 7d49f478c3
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '7d49f478c3'
${ noResults }
dcevm/hotspot/.hg/patches/light-jdk7u51-deopt-cp.patch

light-jdk7u51-deopt-cp.patch 8.8KB
Raw Blame History

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225 
  1. diff --git a/src/share/vm/classfile/classFileParser.cpp b/src/share/vm/classfile/classFileParser.cpp

  2. index 8590ad1..7e35b1a 100644

  3. --- a/src/share/vm/classfile/classFileParser.cpp

  4. +++ b/src/share/vm/classfile/classFileParser.cpp

  5. @@ -3798,6 +3798,11 @@

  6.        }

  7.      }

  8.  

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

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

  11. +        this_klass->set_deoptimization_incl(true);

  12. +    }

  13. +

  14.      if (TraceClassResolution) {

  15.        // print out the superclass.

  16.        const char * from = Klass::cast(this_klass())->external_name();

  17. diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp

  18. index 3f64268..124c39c 100644

  19. --- a/src/share/vm/classfile/systemDictionary.cpp

  20. +++ b/src/share/vm/classfile/systemDictionary.cpp

  21. @@ -1256,6 +1256,11 @@

  22.        }

  23.      }

  24.  

  25. +    if (HotswapDeoptClassPath != NULL) {

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

  27. +        ik->set_deoptimization_incl(true);

  28. +    }

  29. +

  30.      if (TraceClassLoading) {

  31.        ResourceMark rm;

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

  33. diff --git a/src/share/vm/code/codeCache.cpp b/src/share/vm/code/codeCache.cpp

  34. index 70574bc..722ecfd 100644

  35. --- a/src/share/vm/code/codeCache.cpp

  36. +++ b/src/share/vm/code/codeCache.cpp

  37. @@ -713,6 +713,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 --git a/src/share/vm/code/codeCache.hpp b/src/share/vm/code/codeCache.hpp

  52. index a670805..0206b48 100644

  53. --- a/src/share/vm/code/codeCache.hpp

  54. +++ b/src/share/vm/code/codeCache.hpp

  55. @@ -186,6 +186,7 @@

  56.  #endif // HOTSWAP

  57.  

  58.    static void mark_all_nmethods_for_deoptimization();

  59. +  static void mark_all_incl_nmethods_for_deoptimization();

  60.    static int  mark_for_deoptimization(methodOop dependee);

  61.    static void make_marked_nmethods_zombies();

  62.    static void make_marked_nmethods_not_entrant();

  63. diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp

  64. index 59f5f7e..b7d0742 100644

  65. --- a/src/share/vm/code/nmethod.cpp

  66. +++ b/src/share/vm/code/nmethod.cpp

  67. @@ -465,6 +465,7 @@

  68.    _lazy_critical_native       = 0;

  69.    _has_wide_vectors           = 0;

  70.    _marked_for_deoptimization  = 0;

  71. +  _deoptimization_incl        = false;

  72.    _lock_count                 = 0;

  73.    _stack_traversal_mark       = 0;

  74.    _unload_reported            = false;           // jvmti state

  75. @@ -673,6 +674,9 @@

  76.      _exception_cache         = NULL;

  77.      _pc_desc_cache.reset_to(NULL);

  78.  

  79. +    if (method != NULL)

  80. +      _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl();

  81. +

  82.      code_buffer->copy_oops_to(this);

  83.      if (ScavengeRootsInCode && detect_scavenge_root_oops()) {

  84.        CodeCache::add_scavenge_root_nmethod(this);

  85. @@ -754,6 +758,9 @@

  86.      _osr_entry_point         = NULL;

  87.      _exception_cache         = NULL;

  88.      _pc_desc_cache.reset_to(NULL);

  89. +

  90. +    if (method != NULL)

  91. +      _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl();

  92.  

  93.      code_buffer->copy_oops_to(this);

  94.      debug_only(verify_scavenge_root_oops());

  95. @@ -863,6 +870,9 @@

  96.      _exception_cache         = NULL;

  97.      _pc_desc_cache.reset_to(scopes_pcs_begin());

  98.  

  99. +    if (method != NULL)

  100. +      _deoptimization_incl = Klass::cast(method->method_holder())->is_deoptimization_incl();

  101. +

  102.      // Copy contents of ScopeDescRecorder to nmethod

  103.      code_buffer->copy_oops_to(this);

  104.      debug_info->copy_to(this);

  105. diff --git a/src/share/vm/code/nmethod.hpp b/src/share/vm/code/nmethod.hpp

  106. index 8d76afb..d2d1acc 100644

  107. --- a/src/share/vm/code/nmethod.hpp

  108. +++ b/src/share/vm/code/nmethod.hpp

  109. @@ -169,6 +169,8 @@

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

  111.    bool _marked_for_deoptimization;           // Used for stack deoptimization

  112.  

  113. +  bool _deoptimization_incl;

  114. +

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

  116.    bool _unload_reported;

  117.  

  118. @@ -412,6 +414,11 @@

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

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

  121.  

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

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

  124. +

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

  126. +

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

  128.  

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

  130. diff --git a/src/share/vm/oops/klass.cpp b/src/share/vm/oops/klass.cpp

  131. index a928777..d3714b7 100644

  132. --- a/src/share/vm/oops/klass.cpp

  133. +++ b/src/share/vm/oops/klass.cpp

  134. @@ -163,6 +163,7 @@

  135.  

  136.    kl->set_redefinition_flags(Klass::NoRedefinition);

  137.    kl->set_redefining(false);

  138. +  kl->set_deoptimization_incl(false);

  139.    kl->set_new_version(NULL);

  140.    kl->set_old_version(NULL);

  141.    kl->set_redefinition_index(-1);

  142. @@ -233,6 +234,8 @@

  143.    if (FastSuperclassLimit == 0) {

  144.      // None of the other machinery matters.

  145.      set_super(k);

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

  147. +      set_deoptimization_incl(true);

  148.      return;

  149.    }

  150.    if (k == NULL) {

  151. @@ -244,6 +247,8 @@

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

  153.      set_super(k);

  154.      Klass* sup = k->klass_part();

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

  156. +      set_deoptimization_incl(true);

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

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

  159.      if (!can_be_primary_super_slow())

  160. diff --git a/src/share/vm/oops/klass.hpp b/src/share/vm/oops/klass.hpp

  161. index bf242d9..884deae 100644

  162. --- a/src/share/vm/oops/klass.hpp

  163. +++ b/src/share/vm/oops/klass.hpp

  164. @@ -292,6 +292,7 @@

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

  166.    int *                 _update_information;     // Update information

  167.    bool                  _is_redefining;

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

  169.  

  170.  #ifndef PRODUCT

  171.    int           _verify_count;  // to avoid redundant verifies

  172. @@ -376,6 +377,9 @@

  173.      else { return _old_version->klass_part()->is_same_or_older_version(klass); }

  174.    }

  175.  

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

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

  178. +

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

  180.    jint revision_number() const {

  181.      return _revision_number;

  182. diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp

  183. index cb90823..6836fae 100644

  184. --- a/src/share/vm/prims/jvmtiRedefineClasses.cpp

  185. +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp

  186. @@ -482,6 +482,8 @@

  187.  

  188.      new_class->set_redefinition_flags(redefinition_flags);

  189.  

  190. +    new_class->set_deoptimization_incl(true);

  191. +

  192.      _max_redefinition_flags = _max_redefinition_flags | redefinition_flags;

  193.  

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

  195. @@ -1857,7 +1859,10 @@

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

  197.      Universe::flush_evol_dependents_on(k_h);

  198.    } else {

  199. -    CodeCache::mark_all_nmethods_for_deoptimization();

  200. +  	if (HotswapDeoptClassPath == NULL)

  201. +  		CodeCache::mark_all_nmethods_for_deoptimization();

  202. +  	else

  203. +    	CodeCache::mark_all_incl_nmethods_for_deoptimization();

  204.  

  205.      ResourceMark rm(THREAD);

  206.      DeoptimizationMarker dm;

  207. diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp

  208. index 341b399..1e8b1b0 100644

  209. --- a/src/share/vm/runtime/globals.hpp

  210. +++ b/src/share/vm/runtime/globals.hpp

  211. @@ -3650,7 +3650,13 @@

  212.    product(bool, EnableTracing, false,                                       \

  213.                    "Enable event-based tracing")                             \

  214.    product(bool, UseLockedTracing, false,                                    \

  215. -          "Use locked-tracing when doing event-based tracing")

  216. +          "Use locked-tracing when doing event-based tracing")              \

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

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

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

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

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

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

  223.  

  224.  /*

  225.   *  Macros for factoring of globals