--- a/hotspot/src/share/vm/prims/unsafe.cpp Sat Feb 15 14:41:04 2014 -0500
+++ b/hotspot/src/share/vm/prims/unsafe.cpp Tue Feb 18 09:15:40 2014 +0100
@@ -44,11 +44,6 @@
* Implementation of class sun.misc.Unsafe
*/
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL3(hotspot, thread__park__begin, uintptr_t, int, long long);
-HS_DTRACE_PROBE_DECL1(hotspot, thread__park__end, uintptr_t);
-HS_DTRACE_PROBE_DECL1(hotspot, thread__unpark, uintptr_t);
-#endif /* !USDT2 */
#define MAX_OBJECT_SIZE \
( arrayOopDesc::header_size(T_DOUBLE) * HeapWordSize \
@@ -1211,20 +1206,12 @@
UNSAFE_ENTRY(void, Unsafe_Park(JNIEnv *env, jobject unsafe, jboolean isAbsolute, jlong time))
UnsafeWrapper("Unsafe_Park");
EventThreadPark event;
-#ifndef USDT2
- HS_DTRACE_PROBE3(hotspot, thread__park__begin, thread->parker(), (int) isAbsolute, time);
-#else /* USDT2 */
- HOTSPOT_THREAD_PARK_BEGIN(
- (uintptr_t) thread->parker(), (int) isAbsolute, time);
-#endif /* USDT2 */
+ HOTSPOT_THREAD_PARK_BEGIN((uintptr_t) thread->parker(), (int) isAbsolute, time);
+
JavaThreadParkedState jtps(thread, time != 0);
thread->parker()->park(isAbsolute != 0, time);
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, thread__park__end, thread->parker());
-#else /* USDT2 */
- HOTSPOT_THREAD_PARK_END(
- (uintptr_t) thread->parker());
-#endif /* USDT2 */
+
+ HOTSPOT_THREAD_PARK_END((uintptr_t) thread->parker());
if (event.should_commit()) {
oop obj = thread->current_park_blocker();
event.set_klass((obj != NULL) ? obj->klass() : NULL);
@@ -1263,12 +1250,7 @@
}
}
if (p != NULL) {
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, thread__unpark, p);
-#else /* USDT2 */
- HOTSPOT_THREAD_UNPARK(
- (uintptr_t) p);
-#endif /* USDT2 */
+ HOTSPOT_THREAD_UNPARK((uintptr_t) p);
p->unpark();
}
UNSAFE_END