src/share/vm/prims/jvm.cpp

*** 35,44 ****
--- 35,45 ----
  #include "classfile/systemDictionaryShared.hpp"
  #endif
  #include "classfile/vmSymbols.hpp"
  #include "gc_interface/collectedHeap.inline.hpp"
  #include "interpreter/bytecode.hpp"
+ #include "jfr/jfrEvents.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/referenceType.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/fieldStreams.hpp"
  #include "oops/instanceKlass.hpp"
*** 65,75 ****
  #include "runtime/vframe.hpp"
  #include "runtime/vm_operations.hpp"
  #include "services/attachListener.hpp"
  #include "services/management.hpp"
  #include "services/threadService.hpp"
- #include "trace/tracing.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/histogram.hpp"
--- 66,75 ----
*** 3207,3216 ****
--- 3207,3222 ----
    } else {
      os::yield();
    }
  JVM_END
  
+ static void post_thread_sleep_event(EventThreadSleep* event, jlong millis) {
+   assert(event != NULL, "invariant");
+   assert(event->should_commit(), "invariant");
+   event->set_time(millis);
+   event->commit();
+ }
  
  JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
    JVMWrapper("JVM_Sleep");
  
    if (millis < 0) {
*** 3253,3264 ****
      if (os::sleep(thread, millis, true) == OS_INTRPT) {
        // An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
        // us while we were sleeping. We do not overwrite those.
        if (!HAS_PENDING_EXCEPTION) {
          if (event.should_commit()) {
!           event.set_time(millis);
!           event.commit();
          }
  #ifndef USDT2
          HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
  #else /* USDT2 */
          HOTSPOT_THREAD_SLEEP_END(
--- 3259,3269 ----
      if (os::sleep(thread, millis, true) == OS_INTRPT) {
        // An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
        // us while we were sleeping. We do not overwrite those.
        if (!HAS_PENDING_EXCEPTION) {
          if (event.should_commit()) {
!           post_thread_sleep_event(&event, millis);
          }
  #ifndef USDT2
          HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
  #else /* USDT2 */
          HOTSPOT_THREAD_SLEEP_END(
*** 3270,3281 ****
        }
      }
      thread->osthread()->set_state(old_state);
    }
    if (event.should_commit()) {
!     event.set_time(millis);
!     event.commit();
    }
  #ifndef USDT2
    HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
  #else /* USDT2 */
    HOTSPOT_THREAD_SLEEP_END(
--- 3275,3285 ----
        }
      }
      thread->osthread()->set_state(old_state);
    }
    if (event.should_commit()) {
!     post_thread_sleep_event(&event, millis);
    }
  #ifndef USDT2
    HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
  #else /* USDT2 */
    HOTSPOT_THREAD_SLEEP_END(