src/share/vm/oops/klass.hpp

*** 30,47 ****
  #include "memory/memRegion.hpp"
  #include "memory/specialized_oop_closures.hpp"
  #include "oops/klassPS.hpp"
  #include "oops/metadata.hpp"
  #include "oops/oop.hpp"
- #include "trace/traceMacros.hpp"
  #include "utilities/accessFlags.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
  #include "gc_implementation/g1/g1OopClosures.hpp"
  #include "gc_implementation/parNew/parOopClosures.hpp"
  #endif // INCLUDE_ALL_GCS
  
  //
  // A Klass provides:
  //  1: language level class object (method dictionary etc.)
  //  2: provide vm dispatch behavior for the object
--- 30,49 ----
  #include "memory/memRegion.hpp"
  #include "memory/specialized_oop_closures.hpp"
  #include "oops/klassPS.hpp"
  #include "oops/metadata.hpp"
  #include "oops/oop.hpp"
  #include "utilities/accessFlags.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp"
  #include "gc_implementation/g1/g1OopClosures.hpp"
  #include "gc_implementation/parNew/parOopClosures.hpp"
  #endif // INCLUDE_ALL_GCS
+ #if INCLUDE_JFR
+ #include "jfr/support/jfrTraceIdExtension.hpp"
+ #endif
  
  //
  // A Klass provides:
  //  1: language level class object (method dictionary etc.)
  //  2: provide vm dispatch behavior for the object
*** 168,178 ****
    // (the 64-bit chunk goes first, to avoid some fragmentation)
    jlong    _last_biased_lock_bulk_revocation_time;
    markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
    jint     _biased_lock_revocation_count;
  
!   TRACE_DEFINE_KLASS_TRACE_ID;
  
    // Remembered sets support for the oops in the klasses.
    jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
    jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
  
--- 170,180 ----
    // (the 64-bit chunk goes first, to avoid some fragmentation)
    jlong    _last_biased_lock_bulk_revocation_time;
    markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
    jint     _biased_lock_revocation_count;
  
!   JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
  
    // Remembered sets support for the oops in the klasses.
    jbyte _modified_oops;             // Card Table Equivalent (YC/CMS support)
    jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
  
*** 610,620 ****
    int atomic_incr_biased_lock_revocation_count();
    void set_biased_lock_revocation_count(int val) { _biased_lock_revocation_count = (jint) val; }
    jlong last_biased_lock_bulk_revocation_time() { return _last_biased_lock_bulk_revocation_time; }
    void  set_last_biased_lock_bulk_revocation_time(jlong cur_time) { _last_biased_lock_bulk_revocation_time = cur_time; }
  
!   TRACE_DEFINE_KLASS_METHODS;
  
    // garbage collection support
    virtual void oops_do(OopClosure* cl);
  
    // Iff the class loader (or mirror for anonymous classes) is alive the
--- 612,622 ----
    int atomic_incr_biased_lock_revocation_count();
    void set_biased_lock_revocation_count(int val) { _biased_lock_revocation_count = (jint) val; }
    jlong last_biased_lock_bulk_revocation_time() { return _last_biased_lock_bulk_revocation_time; }
    void  set_last_biased_lock_bulk_revocation_time(jlong cur_time) { _last_biased_lock_bulk_revocation_time = cur_time; }
  
!   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
  
    // garbage collection support
    virtual void oops_do(OopClosure* cl);
  
    // Iff the class loader (or mirror for anonymous classes) is alive the