src/share/vm/prims/jni.cpp

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 72,82 ****
  #include "runtime/signature.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/vm_operations.hpp"
  #include "services/runtimeService.hpp"
  #include "trace/tracing.hpp"
- #include "trace/traceEventTypes.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/histogram.hpp"
  #ifdef TARGET_OS_FAMILY_linux
--- 72,81 ----
*** 5012,5021 ****
--- 5011,5021 ----
    return ret;
  }
  
  #ifndef PRODUCT
  
+ #include "gc_implementation/shared/gcTimer.hpp"
  #include "gc_interface/collectedHeap.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/g1/heapRegionRemSet.hpp"
  #endif
  #include "utilities/quickSort.hpp"
*** 5029,5038 ****
--- 5029,5039 ----
  
  void execute_internal_vm_tests() {
    if (ExecuteInternalVMTests) {
      tty->print_cr("Running internal VM tests");
      run_unit_test(GlobalDefinitions::test_globals());
+     run_unit_test(GCTimerAllTest::all());
      run_unit_test(arrayOopDesc::test_max_array_length());
      run_unit_test(CollectedHeap::test_is_in());
      run_unit_test(QuickSort::test_quick_sort());
      run_unit_test(AltHashing::test_alt_hash());
  #if INCLUDE_VM_STRUCTS
*** 5129,5141 ****
      // Notify JVMTI
      if (JvmtiExport::should_post_thread_life()) {
         JvmtiExport::post_thread_start(thread);
      }
  
!     EVENT_BEGIN(TraceEventThreadStart, event);
!     EVENT_COMMIT(event,
!         EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(thread->threadObj())));
  
      // Check if we should compile all classes on bootclasspath
      NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
      NOT_PRODUCT(if (ReplayCompiles) ciReplay::replay(thread);)
      // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
--- 5130,5144 ----
      // Notify JVMTI
      if (JvmtiExport::should_post_thread_life()) {
         JvmtiExport::post_thread_start(thread);
      }
  
!     EventThreadStart event;
!     if (event.should_commit()) {
!       event.set_javalangthread(java_lang_Thread::thread_id(thread->threadObj()));
!       event.commit();
!     }
  
      // Check if we should compile all classes on bootclasspath
      NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
      NOT_PRODUCT(if (ReplayCompiles) ciReplay::replay(thread);)
      // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
*** 5332,5344 ****
    // Notify the debugger
    if (JvmtiExport::should_post_thread_life()) {
      JvmtiExport::post_thread_start(thread);
    }
  
!   EVENT_BEGIN(TraceEventThreadStart, event);
!   EVENT_COMMIT(event,
!       EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(thread->threadObj())));
  
    *(JNIEnv**)penv = thread->jni_environment();
  
    // Now leaving the VM, so change thread_state. This is normally automatically taken care
    // of in the JVM_ENTRY. But in this situation we have to do it manually. Notice, that by
--- 5335,5349 ----
    // Notify the debugger
    if (JvmtiExport::should_post_thread_life()) {
      JvmtiExport::post_thread_start(thread);
    }
  
!   EventThreadStart event;
!   if (event.should_commit()) {
!     event.set_javalangthread(java_lang_Thread::thread_id(thread->threadObj()));
!     event.commit();
!   }
  
    *(JNIEnv**)penv = thread->jni_environment();
  
    // Now leaving the VM, so change thread_state. This is normally automatically taken care
    // of in the JVM_ENTRY. But in this situation we have to do it manually. Notice, that by