src/share/vm/runtime/thread.cpp
Print this page
rev 5878 : [mq]: usdt1-gone
@@ -110,33 +110,10 @@
#ifdef DTRACE_ENABLED
// Only bother with this argument setup if dtrace is available
-#ifndef USDT2
-HS_DTRACE_PROBE_DECL(hotspot, vm__init__begin);
-HS_DTRACE_PROBE_DECL(hotspot, vm__init__end);
-HS_DTRACE_PROBE_DECL5(hotspot, thread__start, char*, intptr_t,
- intptr_t, intptr_t, bool);
-HS_DTRACE_PROBE_DECL5(hotspot, thread__stop, char*, intptr_t,
- intptr_t, intptr_t, bool);
-
-#define DTRACE_THREAD_PROBE(probe, javathread) \
- { \
- ResourceMark rm(this); \
- int len = 0; \
- const char* name = (javathread)->get_thread_name(); \
- len = strlen(name); \
- HS_DTRACE_PROBE5(hotspot, thread__##probe, \
- name, len, \
- java_lang_Thread::thread_id((javathread)->threadObj()), \
- (javathread)->osthread()->thread_id(), \
- java_lang_Thread::is_daemon((javathread)->threadObj())); \
- }
-
-#else /* USDT2 */
-
#define HOTSPOT_THREAD_PROBE_start HOTSPOT_THREAD_START
#define HOTSPOT_THREAD_PROBE_stop HOTSPOT_THREAD_STOP
#define DTRACE_THREAD_PROBE(probe, javathread) \
{ \
@@ -149,12 +126,10 @@
java_lang_Thread::thread_id((javathread)->threadObj()), \
(uintptr_t) (javathread)->osthread()->thread_id(), \
java_lang_Thread::is_daemon((javathread)->threadObj())); \
}
-#endif /* USDT2 */
-
#else // ndef DTRACE_ENABLED
#define DTRACE_THREAD_PROBE(probe, javathread)
#endif // ndef DTRACE_ENABLED
@@ -3389,15 +3364,11 @@
if (PauseAtStartup) {
os::pause();
}
-#ifndef USDT2
- HS_DTRACE_PROBE(hotspot, vm__init__begin);
-#else /* USDT2 */
HOTSPOT_VM_INIT_BEGIN();
-#endif /* USDT2 */
// Record VM creation timing statistics
TraceVmCreationTime create_vm_timer;
create_vm_timer.start();
@@ -3555,15 +3526,11 @@
// Set flag that basic initialization has completed. Used by exceptions and various
// debug stuff, that does not work until all basic classes have been initialized.
set_init_completed();
-#ifndef USDT2
- HS_DTRACE_PROBE(hotspot, vm__init__end);
-#else /* USDT2 */
HOTSPOT_VM_INIT_END();
-#endif /* USDT2 */
// record VM initialization completion time
#if INCLUDE_MANAGEMENT
Management::record_vm_init_completed();
#endif // INCLUDE_MANAGEMENT