src/share/vm/runtime/thread.hpp

*** 40,61 ****
  #include "runtime/safepoint.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "runtime/threadLocalStorage.hpp"
  #include "runtime/thread_ext.hpp"
  #include "runtime/unhandledOops.hpp"
- #include "trace/traceBackend.hpp"
- #include "trace/traceMacros.hpp"
  #include "utilities/exceptions.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/top.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/g1/dirtyCardQueue.hpp"
  #include "gc_implementation/g1/satbQueue.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef TARGET_ARCH_zero
  # include "stack_zero.hpp"
  #endif
  
  class ThreadSafepointState;
  class ThreadProfiler;
  
  class JvmtiThreadState;
--- 40,62 ----
  #include "runtime/safepoint.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "runtime/threadLocalStorage.hpp"
  #include "runtime/thread_ext.hpp"
  #include "runtime/unhandledOops.hpp"
  #include "utilities/exceptions.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/top.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/g1/dirtyCardQueue.hpp"
  #include "gc_implementation/g1/satbQueue.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef TARGET_ARCH_zero
  # include "stack_zero.hpp"
  #endif
+ #if INCLUDE_JFR
+ #include "jfr/support/jfrThreadExtension.hpp"
+ #endif
  
  class ThreadSafepointState;
  class ThreadProfiler;
  
  class JvmtiThreadState;
*** 258,268 ****
                                                  // the Java heap
  
    // Thread-local buffer used by MetadataOnStackMark.
    MetadataOnStackBuffer* _metadata_on_stack_buffer;
  
!   TRACE_DATA _trace_data;                       // Thread-local data for tracing
  
    ThreadExt _ext;
  
    int   _vm_operation_started_count;            // VM_Operation support
    int   _vm_operation_completed_count;          // VM_Operation support
--- 259,269 ----
                                                  // the Java heap
  
    // Thread-local buffer used by MetadataOnStackMark.
    MetadataOnStackBuffer* _metadata_on_stack_buffer;
  
!   JFR_ONLY(DEFINE_THREAD_LOCAL_FIELD_JFR;)      // Thread-local data for jfr
  
    ThreadExt _ext;
  
    int   _vm_operation_started_count;            // VM_Operation support
    int   _vm_operation_completed_count;          // VM_Operation support
*** 439,449 ****
    jlong allocated_bytes()               { return _allocated_bytes; }
    void set_allocated_bytes(jlong value) { _allocated_bytes = value; }
    void incr_allocated_bytes(jlong size) { _allocated_bytes += size; }
    inline jlong cooked_allocated_bytes();
  
!   TRACE_DATA* trace_data()              { return &_trace_data; }
  
    const ThreadExt& ext() const          { return _ext; }
    ThreadExt& ext()                      { return _ext; }
  
    // VM operation support
--- 440,450 ----
    jlong allocated_bytes()               { return _allocated_bytes; }
    void set_allocated_bytes(jlong value) { _allocated_bytes = value; }
    void incr_allocated_bytes(jlong size) { _allocated_bytes += size; }
    inline jlong cooked_allocated_bytes();
  
!   JFR_ONLY(DEFINE_THREAD_LOCAL_ACCESSOR_JFR;)
  
    const ThreadExt& ext() const          { return _ext; }
    ThreadExt& ext()                      { return _ext; }
  
    // VM operation support
*** 624,633 ****
--- 625,636 ----
  
  #undef TLAB_FIELD_OFFSET
  
    static ByteSize allocated_bytes_offset()       { return byte_offset_of(Thread, _allocated_bytes ); }
  
+   JFR_ONLY(DEFINE_THREAD_LOCAL_OFFSET_JFR;)
+ 
   public:
    volatile intptr_t _Stalled ;
    volatile int _TypeTag ;
    ParkEvent * _ParkEvent ;                     // for synchronized()
    ParkEvent * _SleepEvent ;                    // for Thread.sleep