--- a/hotspot/src/share/vm/prims/jvm.cpp Sat Feb 15 14:41:04 2014 -0500
+++ b/hotspot/src/share/vm/prims/jvm.cpp Tue Feb 18 09:15:40 2014 +0100
@@ -82,12 +82,6 @@
#include <errno.h>
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__begin, long long);
-HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__end, int);
-HS_DTRACE_PROBE_DECL0(hotspot, thread__yield);
-#endif /* !USDT2 */
-
/*
NOTE about use of any ctor or function call that can trigger a safepoint/GC:
such ctors and calls MUST NOT come between an oop declaration/init and its
@@ -3008,11 +3002,8 @@
JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
JVMWrapper("JVM_Yield");
if (os::dont_yield()) return;
-#ifndef USDT2
- HS_DTRACE_PROBE0(hotspot, thread__yield);
-#else /* USDT2 */
HOTSPOT_THREAD_YIELD();
-#endif /* USDT2 */
+
// When ConvertYieldToSleep is off (default), this matches the classic VM use of yield.
// Critical for similar threading behaviour
if (ConvertYieldToSleep) {
@@ -3038,12 +3029,7 @@
// And set new thread state to SLEEPING.
JavaThreadSleepState jtss(thread);
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, thread__sleep__begin, millis);
-#else /* USDT2 */
- HOTSPOT_THREAD_SLEEP_BEGIN(
- millis);
-#endif /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_BEGIN(millis);
EventThreadSleep event;
@@ -3071,12 +3057,8 @@
event.set_time(millis);
event.commit();
}
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, thread__sleep__end,1);
-#else /* USDT2 */
- HOTSPOT_THREAD_SLEEP_END(
- 1);
-#endif /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_END(1);
+
// TODO-FIXME: THROW_MSG returns which means we will not call set_state()
// to properly restore the thread state. That's likely wrong.
THROW_MSG(vmSymbols::java_lang_InterruptedException(), "sleep interrupted");
@@ -3088,12 +3070,7 @@
event.set_time(millis);
event.commit();
}
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, thread__sleep__end,0);
-#else /* USDT2 */
- HOTSPOT_THREAD_SLEEP_END(
- 0);
-#endif /* USDT2 */
+ HOTSPOT_THREAD_SLEEP_END(0);
JVM_END
JVM_ENTRY(jobject, JVM_CurrentThread(JNIEnv* env, jclass threadClass))