src/share/vm/runtime/java.cpp

*** 28,37 ****
--- 28,39 ----
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
+ #include "jfr/jfrEvents.hpp"
+ #include "jfr/support/jfrThreadId.hpp"
  #include "memory/genCollectedHeap.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.hpp"
  #include "oops/constantPool.hpp"
  #include "oops/generateOopMap.hpp"
*** 56,66 ****
  #include "runtime/task.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/timer.hpp"
  #include "runtime/vm_operations.hpp"
  #include "services/memTracker.hpp"
- #include "trace/tracing.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/globalDefinitions.hpp"
  #include "utilities/histogram.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/vmError.hpp"
--- 58,67 ----
*** 93,102 ****
--- 94,106 ----
  #include "compiler/methodLiveness.hpp"
  #include "opto/compile.hpp"
  #include "opto/indexSet.hpp"
  #include "opto/runtime.hpp"
  #endif
+ #if INCLUDE_JFR
+ #include "jfr/jfr.hpp"
+ #endif
  
  #ifndef USDT2
  HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
  #endif /* !USDT2 */
  
*** 521,534 ****
    }
  
  
    EventThreadEnd event;
    if (event.should_commit()) {
!       event.set_javalangthread(java_lang_Thread::thread_id(thread->threadObj()));
        event.commit();
    }
  
    // Always call even when there are not JVMTI environments yet, since environments
    // may be attached late and JVMTI must track phases of VM execution
    JvmtiExport::post_vm_death();
    Threads::shutdown_vm_agents();
  
--- 525,540 ----
    }
  
  
    EventThreadEnd event;
    if (event.should_commit()) {
!     event.set_thread(JFR_THREAD_ID(thread));
      event.commit();
    }
  
+   JFR_ONLY(Jfr::on_vm_shutdown();)
+   
    // Always call even when there are not JVMTI environments yet, since environments
    // may be attached late and JVMTI must track phases of VM execution
    JvmtiExport::post_vm_death();
    Threads::shutdown_vm_agents();