Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/java.cpp @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children 04b9a2566eec 94ec88ca68e2
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
103 #include "opto/compile.hpp" 103 #include "opto/compile.hpp"
104 #include "opto/indexSet.hpp" 104 #include "opto/indexSet.hpp"
105 #include "opto/runtime.hpp" 105 #include "opto/runtime.hpp"
106 #endif 106 #endif
107 107
108 #ifndef USDT2
108 HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown); 109 HS_DTRACE_PROBE_DECL(hotspot, vm__shutdown);
110 #endif /* !USDT2 */
109 111
110 #ifndef PRODUCT 112 #ifndef PRODUCT
111 113
112 // Statistics printing (method invocation histogram) 114 // Statistics printing (method invocation histogram)
113 115
545 ShouldNotReachHere(); 547 ShouldNotReachHere();
546 } 548 }
547 549
548 void notify_vm_shutdown() { 550 void notify_vm_shutdown() {
549 // For now, just a dtrace probe. 551 // For now, just a dtrace probe.
552 #ifndef USDT2
550 HS_DTRACE_PROBE(hotspot, vm__shutdown); 553 HS_DTRACE_PROBE(hotspot, vm__shutdown);
551 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); 554 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
555 #else /* USDT2 */
556 HOTSPOT_VM_SHUTDOWN();
557 #endif /* USDT2 */
552 } 558 }
553 559
554 void vm_direct_exit(int code) { 560 void vm_direct_exit(int code) {
555 notify_vm_shutdown(); 561 notify_vm_shutdown();
556 os::wait_for_keypress_at_exit(); 562 os::wait_for_keypress_at_exit();