Mercurial > hg > graal-jvmci-8
comparison src/share/vm/services/runtimeService.cpp @ 4006:436b4a3231bf
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 | f95d63e2154a |
children | fb19af007ffc |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
28 #include "services/management.hpp" | 28 #include "services/management.hpp" |
29 #include "services/runtimeService.hpp" | 29 #include "services/runtimeService.hpp" |
30 #include "utilities/dtrace.hpp" | 30 #include "utilities/dtrace.hpp" |
31 #include "utilities/exceptions.hpp" | 31 #include "utilities/exceptions.hpp" |
32 | 32 |
33 #ifndef USDT2 | |
33 HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin); | 34 HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin); |
34 HS_DTRACE_PROBE_DECL(hs_private, safepoint__end); | 35 HS_DTRACE_PROBE_DECL(hs_private, safepoint__end); |
36 #endif /* !USDT2 */ | |
35 | 37 |
36 TimeStamp RuntimeService::_app_timer; | 38 TimeStamp RuntimeService::_app_timer; |
37 TimeStamp RuntimeService::_safepoint_timer; | 39 TimeStamp RuntimeService::_safepoint_timer; |
38 PerfCounter* RuntimeService::_sync_time_ticks = NULL; | 40 PerfCounter* RuntimeService::_sync_time_ticks = NULL; |
39 PerfCounter* RuntimeService::_total_safepoints = NULL; | 41 PerfCounter* RuntimeService::_total_safepoints = NULL; |
106 capabilities, CHECK); | 108 capabilities, CHECK); |
107 } | 109 } |
108 } | 110 } |
109 | 111 |
110 void RuntimeService::record_safepoint_begin() { | 112 void RuntimeService::record_safepoint_begin() { |
113 #ifndef USDT2 | |
111 HS_DTRACE_PROBE(hs_private, safepoint__begin); | 114 HS_DTRACE_PROBE(hs_private, safepoint__begin); |
115 #else /* USDT2 */ | |
116 HS_PRIVATE_SAFEPOINT_BEGIN(); | |
117 #endif /* USDT2 */ | |
112 | 118 |
113 // Print the time interval in which the app was executing | 119 // Print the time interval in which the app was executing |
114 if (PrintGCApplicationConcurrentTime) { | 120 if (PrintGCApplicationConcurrentTime) { |
115 gclog_or_tty->print_cr("Application time: %3.7f seconds", | 121 gclog_or_tty->print_cr("Application time: %3.7f seconds", |
116 last_application_time_sec()); | 122 last_application_time_sec()); |
131 _sync_time_ticks->inc(_safepoint_timer.ticks_since_update()); | 137 _sync_time_ticks->inc(_safepoint_timer.ticks_since_update()); |
132 } | 138 } |
133 } | 139 } |
134 | 140 |
135 void RuntimeService::record_safepoint_end() { | 141 void RuntimeService::record_safepoint_end() { |
142 #ifndef USDT2 | |
136 HS_DTRACE_PROBE(hs_private, safepoint__end); | 143 HS_DTRACE_PROBE(hs_private, safepoint__end); |
144 #else /* USDT2 */ | |
145 HS_PRIVATE_SAFEPOINT_END(); | |
146 #endif /* USDT2 */ | |
137 | 147 |
138 // Print the time interval for which the app was stopped | 148 // Print the time interval for which the app was stopped |
139 // during the current safepoint operation. | 149 // during the current safepoint operation. |
140 if (PrintGCApplicationStoppedTime) { | 150 if (PrintGCApplicationStoppedTime) { |
141 gclog_or_tty->print_cr("Total time for which application threads " | 151 gclog_or_tty->print_cr("Total time for which application threads " |