Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/klass.hpp	Thu Aug 01 03:44:03 2019 +0100
     1.2 +++ b/src/share/vm/oops/klass.hpp	Mon Aug 12 18:30:40 2019 +0300
     1.3 @@ -32,7 +32,6 @@
     1.4  #include "oops/klassPS.hpp"
     1.5  #include "oops/metadata.hpp"
     1.6  #include "oops/oop.hpp"
     1.7 -#include "trace/traceMacros.hpp"
     1.8  #include "utilities/accessFlags.hpp"
     1.9  #include "utilities/macros.hpp"
    1.10  #if INCLUDE_ALL_GCS
    1.11 @@ -40,6 +39,9 @@
    1.12  #include "gc_implementation/g1/g1OopClosures.hpp"
    1.13  #include "gc_implementation/parNew/parOopClosures.hpp"
    1.14  #endif // INCLUDE_ALL_GCS
    1.15 +#if INCLUDE_JFR
    1.16 +#include "jfr/support/jfrTraceIdExtension.hpp"
    1.17 +#endif
    1.18  
    1.19  //
    1.20  // A Klass provides:
    1.21 @@ -170,7 +172,7 @@
    1.22    markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
    1.23    jint     _biased_lock_revocation_count;
    1.24  
    1.25 -  TRACE_DEFINE_KLASS_TRACE_ID;
    1.26 +  JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
    1.27  
    1.28    // Remembered sets support for the oops in the klasses.
    1.29    jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
    1.30 @@ -613,7 +615,7 @@
    1.31    jlong last_biased_lock_bulk_revocation_time() { return _last_biased_lock_bulk_revocation_time; }
    1.32    void  set_last_biased_lock_bulk_revocation_time(jlong cur_time) { _last_biased_lock_bulk_revocation_time = cur_time; }
    1.33  
    1.34 -  TRACE_DEFINE_KLASS_METHODS;
    1.35 +  JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
    1.36  
    1.37    // garbage collection support
    1.38    virtual void oops_do(OopClosure* cl);