--- a/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Sat Feb 15 14:41:04 2014 -0500
+++ b/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Tue Feb 18 09:15:40 2014 +0100
@@ -41,33 +41,18 @@
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#endif // INCLUDE_ALL_GCS
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool);
-HS_DTRACE_PROBE_DECL(hotspot, gc__end);
-#endif /* !USDT2 */
-
// The same dtrace probe can't be inserted in two different files, so we
// have to call it here, so it's only in one file. Can't create new probes
// for the other file anymore. The dtrace probes have to remain stable.
void VM_GC_Operation::notify_gc_begin(bool full) {
-#ifndef USDT2
- HS_DTRACE_PROBE1(hotspot, gc__begin, full);
- HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
-#else /* USDT2 */
HOTSPOT_GC_BEGIN(
full);
HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
-#endif /* USDT2 */
}
void VM_GC_Operation::notify_gc_end() {
-#ifndef USDT2
- HS_DTRACE_PROBE(hotspot, gc__end);
- HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
-#else /* USDT2 */
HOTSPOT_GC_END();
HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
-#endif /* USDT2 */
}
void VM_GC_Operation::acquire_pending_list_lock() {