Mercurial > hg > graal-jvmci-8

comparison src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp @ 14380:e6195383bcaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8034080: Remove the USDT1 dtrace code from Hotspot Reviewed-by: dholmes, coleenp
author sla
date Tue, 18 Feb 2014 09:15:40 +0100
parents e5d78f318aec
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14379:c66479743828 14380:e6195383bcaf
33 #include "runtime/interfaceSupport.hpp" 33 #include "runtime/interfaceSupport.hpp"
34 #include "runtime/os.hpp" 34 #include "runtime/os.hpp"
35 #include "utilities/dtrace.hpp" 35 #include "utilities/dtrace.hpp"
36 36
37 37
38 #ifndef USDT2
39 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin);
40 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end);
41
42 HS_DTRACE_PROBE_DECL(hs_private, cms__remark__begin);
43 HS_DTRACE_PROBE_DECL(hs_private, cms__remark__end);
44 #endif /* !USDT2 */
45
46 ////////////////////////////////////////////////////////// 38 //////////////////////////////////////////////////////////
47 // Methods in abstract class VM_CMS_Operation 39 // Methods in abstract class VM_CMS_Operation
48 ////////////////////////////////////////////////////////// 40 //////////////////////////////////////////////////////////
49 void VM_CMS_Operation::acquire_pending_list_lock() { 41 void VM_CMS_Operation::acquire_pending_list_lock() {
50 // The caller may block while communicating 42 // The caller may block while communicating
136 void VM_CMS_Initial_Mark::doit() { 128 void VM_CMS_Initial_Mark::doit() {
137 if (lost_race()) { 129 if (lost_race()) {
138 // Nothing to do. 130 // Nothing to do.
139 return; 131 return;
140 } 132 }
141 #ifndef USDT2
142 HS_DTRACE_PROBE(hs_private, cms__initmark__begin);
143 #else /* USDT2 */
144 HS_PRIVATE_CMS_INITMARK_BEGIN(); 133 HS_PRIVATE_CMS_INITMARK_BEGIN();
145 #endif /* USDT2 */
146 134
147 _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark"); 135 _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
148 136
149 GenCollectedHeap* gch = GenCollectedHeap::heap(); 137 GenCollectedHeap* gch = GenCollectedHeap::heap();
150 GCCauseSetter gccs(gch, GCCause::_cms_initial_mark); 138 GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
156 144
157 VM_CMS_Operation::verify_after_gc(); 145 VM_CMS_Operation::verify_after_gc();
158 146
159 _collector->_gc_timer_cm->register_gc_pause_end(); 147 _collector->_gc_timer_cm->register_gc_pause_end();
160 148
161 #ifndef USDT2
162 HS_DTRACE_PROBE(hs_private, cms__initmark__end);
163 #else /* USDT2 */
164 HS_PRIVATE_CMS_INITMARK_END(); 149 HS_PRIVATE_CMS_INITMARK_END();
165 #endif /* USDT2 */
166 } 150 }
167 151
168 ////////////////////////////////////////////////////////// 152 //////////////////////////////////////////////////////////
169 // Methods in class VM_CMS_Final_Remark_Operation 153 // Methods in class VM_CMS_Final_Remark_Operation
170 ////////////////////////////////////////////////////////// 154 //////////////////////////////////////////////////////////
171 void VM_CMS_Final_Remark::doit() { 155 void VM_CMS_Final_Remark::doit() {
172 if (lost_race()) { 156 if (lost_race()) {
173 // Nothing to do. 157 // Nothing to do.
174 return; 158 return;
175 } 159 }
176 #ifndef USDT2
177 HS_DTRACE_PROBE(hs_private, cms__remark__begin);
178 #else /* USDT2 */
179 HS_PRIVATE_CMS_REMARK_BEGIN(); 160 HS_PRIVATE_CMS_REMARK_BEGIN();
180 #endif /* USDT2 */
181 161
182 _collector->_gc_timer_cm->register_gc_pause_start("Final Mark"); 162 _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
183 163
184 GenCollectedHeap* gch = GenCollectedHeap::heap(); 164 GenCollectedHeap* gch = GenCollectedHeap::heap();
185 GCCauseSetter gccs(gch, GCCause::_cms_final_remark); 165 GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
192 VM_CMS_Operation::verify_after_gc(); 172 VM_CMS_Operation::verify_after_gc();
193 173
194 _collector->save_heap_summary(); 174 _collector->save_heap_summary();
195 _collector->_gc_timer_cm->register_gc_pause_end(); 175 _collector->_gc_timer_cm->register_gc_pause_end();
196 176
197 #ifndef USDT2
198 HS_DTRACE_PROBE(hs_private, cms__remark__end);
199 #else /* USDT2 */
200 HS_PRIVATE_CMS_REMARK_END(); 177 HS_PRIVATE_CMS_REMARK_END();
201 #endif /* USDT2 */
202 } 178 }
203 179
204 // VM operation to invoke a concurrent collection of a 180 // VM operation to invoke a concurrent collection of a
205 // GenCollectedHeap heap. 181 // GenCollectedHeap heap.
206 void VM_GenCollectFullConcurrent::doit() { 182 void VM_GenCollectFullConcurrent::doit() {