comparison src/share/vm/runtime/java.cpp @ 14380:e6195383bcaf

8034080: Remove the USDT1 dtrace code from Hotspot Reviewed-by: dholmes, coleenp
author sla
date Tue, 18 Feb 2014 09:15:40 +0100
parents a3ba776d6ab6
children d8041d695d19
comparison
equal deleted inserted replaced
14379:c66479743828 14380:e6195383bcaf
95 #include "opto/compile.hpp" 95 #include "opto/compile.hpp"
96 #include "opto/indexSet.hpp" 96 #include "opto/indexSet.hpp"
97 #include "opto/runtime.hpp" 97 #include "opto/runtime.hpp"
98 #endif 98 #endif
99 99
100 #ifndef USDT2
101 HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
102 #endif /* !USDT2 */
103 100
104 #ifndef PRODUCT 101 #ifndef PRODUCT
105 102
106 // Statistics printing (method invocation histogram) 103 // Statistics printing (method invocation histogram)
107 104
601 ShouldNotReachHere(); 598 ShouldNotReachHere();
602 } 599 }
603 600
604 void notify_vm_shutdown() { 601 void notify_vm_shutdown() {
605 // For now, just a dtrace probe. 602 // For now, just a dtrace probe.
606 #ifndef USDT2
607 HS_DTRACE_PROBE(hotspot, vm__shutdown);
608 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
609 #else /* USDT2 */
610 HOTSPOT_VM_SHUTDOWN(); 603 HOTSPOT_VM_SHUTDOWN();
611 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); 604 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
612 #endif /* USDT2 */
613 } 605 }
614 606
615 void vm_direct_exit(int code) { 607 void vm_direct_exit(int code) {
616 notify_vm_shutdown(); 608 notify_vm_shutdown();
617 os::wait_for_keypress_at_exit(); 609 os::wait_for_keypress_at_exit();