comparison src/share/vm/services/runtimeService.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents e6195383bcaf
children 7848fc12602b
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
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 #include "utilities/macros.hpp" 32 #include "utilities/macros.hpp"
33
34 #ifndef USDT2
35 HS_DTRACE_PROBE_DECL(hs_private, safepoint__begin);
36 HS_DTRACE_PROBE_DECL(hs_private, safepoint__end);
37 #endif /* !USDT2 */
33 38
34 #if INCLUDE_MANAGEMENT 39 #if INCLUDE_MANAGEMENT
35 TimeStamp RuntimeService::_app_timer; 40 TimeStamp RuntimeService::_app_timer;
36 TimeStamp RuntimeService::_safepoint_timer; 41 TimeStamp RuntimeService::_safepoint_timer;
37 PerfCounter* RuntimeService::_sync_time_ticks = NULL; 42 PerfCounter* RuntimeService::_sync_time_ticks = NULL;
105 capabilities, CHECK); 110 capabilities, CHECK);
106 } 111 }
107 } 112 }
108 113
109 void RuntimeService::record_safepoint_begin() { 114 void RuntimeService::record_safepoint_begin() {
115 #ifndef USDT2
116 HS_DTRACE_PROBE(hs_private, safepoint__begin);
117 #else /* USDT2 */
110 HS_PRIVATE_SAFEPOINT_BEGIN(); 118 HS_PRIVATE_SAFEPOINT_BEGIN();
119 #endif /* USDT2 */
111 120
112 // Print the time interval in which the app was executing 121 // Print the time interval in which the app was executing
113 if (PrintGCApplicationConcurrentTime && _app_timer.is_updated()) { 122 if (PrintGCApplicationConcurrentTime && _app_timer.is_updated()) {
114 gclog_or_tty->date_stamp(PrintGCDateStamps); 123 gclog_or_tty->date_stamp(PrintGCDateStamps);
115 gclog_or_tty->stamp(PrintGCTimeStamps); 124 gclog_or_tty->stamp(PrintGCTimeStamps);
132 _sync_time_ticks->inc(_safepoint_timer.ticks_since_update()); 141 _sync_time_ticks->inc(_safepoint_timer.ticks_since_update());
133 } 142 }
134 } 143 }
135 144
136 void RuntimeService::record_safepoint_end() { 145 void RuntimeService::record_safepoint_end() {
146 #ifndef USDT2
147 HS_DTRACE_PROBE(hs_private, safepoint__end);
148 #else /* USDT2 */
137 HS_PRIVATE_SAFEPOINT_END(); 149 HS_PRIVATE_SAFEPOINT_END();
150 #endif /* USDT2 */
138 151
139 // Print the time interval for which the app was stopped 152 // Print the time interval for which the app was stopped
140 // during the current safepoint operation. 153 // during the current safepoint operation.
141 if (PrintGCApplicationStoppedTime) { 154 if (PrintGCApplicationStoppedTime) {
142 gclog_or_tty->date_stamp(PrintGCDateStamps); 155 gclog_or_tty->date_stamp(PrintGCDateStamps);