comparison src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp @ 14278:a3ba776d6ab6

8030812: Change the solaris DTrace implementation to use USDT2 instead of USDT1 Reviewed-by: coleenp, sspitsyn, dsamersoff
author sla
date Thu, 16 Jan 2014 20:14:21 +0100
parents 86e6d691f2e1
children e5d78f318aec
comparison
equal deleted inserted replaced
14277:3bee68af0296 14278:a3ba776d6ab6
139 return; 139 return;
140 } 140 }
141 #ifndef USDT2 141 #ifndef USDT2
142 HS_DTRACE_PROBE(hs_private, cms__initmark__begin); 142 HS_DTRACE_PROBE(hs_private, cms__initmark__begin);
143 #else /* USDT2 */ 143 #else /* USDT2 */
144 HS_PRIVATE_CMS_INITMARK_BEGIN( 144 HS_PRIVATE_CMS_INITMARK_BEGIN();
145 );
146 #endif /* USDT2 */ 145 #endif /* USDT2 */
147 146
148 _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark"); 147 _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
149 148
150 GenCollectedHeap* gch = GenCollectedHeap::heap(); 149 GenCollectedHeap* gch = GenCollectedHeap::heap();
160 _collector->_gc_timer_cm->register_gc_pause_end(); 159 _collector->_gc_timer_cm->register_gc_pause_end();
161 160
162 #ifndef USDT2 161 #ifndef USDT2
163 HS_DTRACE_PROBE(hs_private, cms__initmark__end); 162 HS_DTRACE_PROBE(hs_private, cms__initmark__end);
164 #else /* USDT2 */ 163 #else /* USDT2 */
165 HS_PRIVATE_CMS_INITMARK_END( 164 HS_PRIVATE_CMS_INITMARK_END();
166 );
167 #endif /* USDT2 */ 165 #endif /* USDT2 */
168 } 166 }
169 167
170 ////////////////////////////////////////////////////////// 168 //////////////////////////////////////////////////////////
171 // Methods in class VM_CMS_Final_Remark_Operation 169 // Methods in class VM_CMS_Final_Remark_Operation
176 return; 174 return;
177 } 175 }
178 #ifndef USDT2 176 #ifndef USDT2
179 HS_DTRACE_PROBE(hs_private, cms__remark__begin); 177 HS_DTRACE_PROBE(hs_private, cms__remark__begin);
180 #else /* USDT2 */ 178 #else /* USDT2 */
181 HS_PRIVATE_CMS_REMARK_BEGIN( 179 HS_PRIVATE_CMS_REMARK_BEGIN();
182 );
183 #endif /* USDT2 */ 180 #endif /* USDT2 */
184 181
185 _collector->_gc_timer_cm->register_gc_pause_start("Final Mark"); 182 _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
186 183
187 GenCollectedHeap* gch = GenCollectedHeap::heap(); 184 GenCollectedHeap* gch = GenCollectedHeap::heap();
198 _collector->_gc_timer_cm->register_gc_pause_end(); 195 _collector->_gc_timer_cm->register_gc_pause_end();
199 196
200 #ifndef USDT2 197 #ifndef USDT2
201 HS_DTRACE_PROBE(hs_private, cms__remark__end); 198 HS_DTRACE_PROBE(hs_private, cms__remark__end);
202 #else /* USDT2 */ 199 #else /* USDT2 */
203 HS_PRIVATE_CMS_REMARK_END( 200 HS_PRIVATE_CMS_REMARK_END();
204 );
205 #endif /* USDT2 */ 201 #endif /* USDT2 */
206 } 202 }
207 203
208 // VM operation to invoke a concurrent collection of a 204 // VM operation to invoke a concurrent collection of a
209 // GenCollectedHeap heap. 205 // GenCollectedHeap heap.