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

full-jdk7u60-deopt-cp.patch 10KB
Raw Blame History

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

  2. index 6e362d9..2947c33 100644

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

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

  5. @@ -3942,6 +3942,11 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,

  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 365aeda..dedc043 100644

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

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

  21. @@ -1255,6 +1255,11 @@ instanceKlassHandle SystemDictionary::load_shared_class(

  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..b28cb02 100644

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

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

  37. @@ -715,6 +715,14 @@ int CodeCache::mark_for_evol_deoptimization(instanceKlassHandle dependee) {

  38.  

  39.  

  40.  // Deoptimize all methods

  41. +void CodeCache::mark_all_incl_nmethods_for_deoptimization() {

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

  43. +  FOR_ALL_ALIVE_NMETHODS(nm) {

  44. +    nm->mark_for_deoptimization_incl();

  45. +  }

  46. +}

  47. +

  48. +// Deoptimize all methods

  49.  void CodeCache::mark_all_nmethods_for_deoptimization() {

  50.    MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);

  51.    FOR_ALL_ALIVE_NMETHODS(nm) {

  52. diff --git a/src/share/vm/code/codeCache.hpp b/src/share/vm/code/codeCache.hpp

  53. index a670805..0206b48 100644

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

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

  56. @@ -186,6 +186,7 @@ class CodeCache : AllStatic {

  57.  #endif // HOTSWAP

  58.  

  59.    static void mark_all_nmethods_for_deoptimization();

  60. +  static void mark_all_incl_nmethods_for_deoptimization();

  61.    static int  mark_for_deoptimization(methodOop dependee);

  62.    static void make_marked_nmethods_zombies();

  63.    static void make_marked_nmethods_not_entrant();

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

  65. index dddbea2..b7c6a79 100644

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

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

  68. @@ -465,6 +465,7 @@ void nmethod::init_defaults() {

  69.    _lazy_critical_native       = 0;

  70.    _has_wide_vectors           = 0;

  71.    _marked_for_deoptimization  = 0;

  72. +  _deoptimization_incl        = false;

  73.    _lock_count                 = 0;

  74.    _stack_traversal_mark       = 0;

  75.    _unload_reported            = false;           // jvmti state

  76. @@ -673,6 +674,9 @@ nmethod::nmethod(

  77.      _exception_cache         = NULL;

  78.      _pc_desc_cache.reset_to(NULL);

  79.  

  80. +    if (method != NULL)

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

  82. +

  83.      code_buffer->copy_oops_to(this);

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

  85.        CodeCache::add_scavenge_root_nmethod(this);

  86. @@ -756,6 +760,9 @@ nmethod::nmethod(

  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.      CodeCache::commit(this);

  96. @@ -864,6 +871,9 @@ nmethod::nmethod(

  97.      _exception_cache         = NULL;

  98.      _pc_desc_cache.reset_to(scopes_pcs_begin());

  99.  

  100. +    if (method != NULL)

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

  102. +

  103.      // Copy contents of ScopeDescRecorder to nmethod

  104.      code_buffer->copy_oops_to(this);

  105.      debug_info->copy_to(this);

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

  107. index 1a4ad9e..70d220c 100644

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

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

  110. @@ -169,6 +169,8 @@ class nmethod : public CodeBlob {

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

  112.    bool _marked_for_deoptimization;           // Used for stack deoptimization

  113.  

  114. +  bool _deoptimization_incl;

  115. +

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

  117.    bool _unload_reported;

  118.  

  119. @@ -412,6 +414,11 @@ class nmethod : public CodeBlob {

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

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

  122.  

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

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

  125. +

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

  127. +

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

  129.  

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

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

  132. index 767588c..59d9448 100644

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

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

  135. @@ -57,7 +57,11 @@ bool Klass::is_subclass_of(klassOop k) const {

  136.  

  137.  void Klass::update_supers_to_newest_version() {

  138.  

  139. -  if (super() != NULL) set_super(super()->klass_part()->newest_version());

  140. +  if (super() != NULL) {

  141. +    set_super(super()->klass_part()->newest_version());

  142. +    if (super()->klass_part()->is_deoptimization_incl())

  143. +      set_deoptimization_incl(true);

  144. +  }

  145.    

  146.    for (uint i=0; i<primary_super_limit(); i++) {

  147.      klassOop cur = _primary_supers[i];

  148. @@ -183,6 +187,7 @@ klassOop Klass::base_create_klass_oop(KlassHandle& klass, int size,

  149.  

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

  151.    kl->set_redefining(false);

  152. +  kl->set_deoptimization_incl(false);

  153.    kl->set_new_version(NULL);

  154.    kl->set_old_version(NULL);

  155.    kl->set_redefinition_index(-1);

  156. @@ -256,6 +261,8 @@ void Klass::initialize_supers(klassOop k, TRAPS) {

  157.    if (FastSuperclassLimit == 0) {

  158.      // None of the other machinery matters.

  159.      set_super(k);

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

  161. +      set_deoptimization_incl(true);

  162.      return;

  163.    }

  164.    if (k == NULL) {

  165. @@ -267,6 +274,8 @@ void Klass::initialize_supers(klassOop k, TRAPS) {

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

  167.      set_super(k);

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

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

  170. +      set_deoptimization_incl(true);

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

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

  173.      if (!can_be_primary_super_slow())

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

  175. index d086b5d..0719b90 100644

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

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

  178. @@ -303,6 +303,7 @@ class Klass : public Klass_vtbl {

  179.    char                  _field_redefinition_policy;

  180.    char                  _static_field_redefinition_policy;

  181.    bool                  _is_redefining;

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

  183.  

  184.  #ifndef PRODUCT

  185.    int           _verify_count;  // to avoid redundant verifies

  186. @@ -387,6 +388,9 @@ class Klass : public Klass_vtbl {

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

  188.    }

  189.  

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

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

  192. +

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

  194.    jint revision_number() const {

  195.      return _revision_number;

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

  197. index ef4f380..5d2382c 100644

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

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

  200. @@ -435,6 +435,8 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {

  201.  

  202.      new_class->set_redefinition_flags(redefinition_flags);

  203.  

  204. +    new_class->set_deoptimization_incl(true);

  205. +

  206.      _max_redefinition_flags = _max_redefinition_flags | redefinition_flags;

  207.  

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

  209. @@ -2580,7 +2582,8 @@ void VM_RedefineClasses::adjust_cpool_cache(klassOop k_oop_latest, oop initiatin

  210.      }*/

  211.  

  212.      Klass *k = k_oop->klass_part();

  213. -    if (k->oop_is_instance()) {

  214. +

  215. +    if (k->oop_is_instance() && (HotswapDeoptClassPath == NULL || k->is_deoptimization_incl())) {

  216.        HandleMark hm(THREAD);

  217.        instanceKlass *ik = (instanceKlass *) k;

  218.  

  219. @@ -2683,7 +2686,11 @@ void VM_RedefineClasses::flush_dependent_code(instanceKlassHandle k_h, TRAPS) {

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

  221.      Universe::flush_evol_dependents_on(k_h);

  222.    } else {

  223. -    CodeCache::mark_all_nmethods_for_deoptimization();

  224. +

  225. +  	if (HotswapDeoptClassPath == NULL)

  226. +  		CodeCache::mark_all_nmethods_for_deoptimization();

  227. +  	else

  228. +    	CodeCache::mark_all_incl_nmethods_for_deoptimization();

  229.  

  230.      ResourceMark rm(THREAD);

  231.      DeoptimizationMarker dm;

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

  233. index 4775f3d..1141540 100644

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

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

  236. @@ -3680,7 +3680,13 @@ class CommandLineFlags {

  237.    product(bool, EnableTracing, false,                                       \

  238.                    "Enable event-based tracing")                             \

  239.    product(bool, UseLockedTracing, false,                                    \

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

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

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

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

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

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

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

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

  248.  

  249.  /*

  250.   *  Macros for factoring of globals