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

     1.1 --- a/src/share/vm/runtime/java.cpp	Thu Feb 27 19:01:32 2020 +0000
     1.2 +++ b/src/share/vm/runtime/java.cpp	Tue Mar 03 12:57:23 2020 +0000
     1.3 @@ -30,6 +30,8 @@
     1.4  #include "compiler/compileBroker.hpp"
     1.5  #include "compiler/compilerOracle.hpp"
     1.6  #include "interpreter/bytecodeHistogram.hpp"
     1.7 +#include "jfr/jfrEvents.hpp"
     1.8 +#include "jfr/support/jfrThreadId.hpp"
     1.9  #include "memory/genCollectedHeap.hpp"
    1.10  #include "memory/oopFactory.hpp"
    1.11  #include "memory/universe.hpp"
    1.12 @@ -59,7 +61,6 @@
    1.13  #include "runtime/timer.hpp"
    1.14  #include "runtime/vm_operations.hpp"
    1.15  #include "services/memTracker.hpp"
    1.16 -#include "trace/tracing.hpp"
    1.17  #include "utilities/dtrace.hpp"
    1.18  #include "utilities/globalDefinitions.hpp"
    1.19  #include "utilities/histogram.hpp"
    1.20 @@ -96,6 +97,9 @@
    1.21  #include "opto/indexSet.hpp"
    1.22  #include "opto/runtime.hpp"
    1.23  #endif
    1.24 +#if INCLUDE_JFR
    1.25 +#include "jfr/jfr.hpp"
    1.26 +#endif
    1.27  
    1.28  #ifndef USDT2
    1.29  HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
    1.30 @@ -524,10 +528,12 @@
    1.31  
    1.32    EventThreadEnd event;
    1.33    if (event.should_commit()) {
    1.34 -      event.set_javalangthread(java_lang_Thread::thread_id(thread->threadObj()));
    1.35 -      event.commit();
    1.36 +    event.set_thread(JFR_THREAD_ID(thread));
    1.37 +    event.commit();
    1.38    }
    1.39  
    1.40 +  JFR_ONLY(Jfr::on_vm_shutdown();)
    1.41 +
    1.42    // Always call even when there are not JVMTI environments yet, since environments
    1.43    // may be attached late and JVMTI must track phases of VM execution
    1.44    JvmtiExport::post_vm_death();