src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp

rev 5893 : 8034080: Remove the USDT1 dtrace code from Hotspot

*** 33,50 ****
  #include "runtime/interfaceSupport.hpp"
  #include "runtime/os.hpp"
  #include "utilities/dtrace.hpp"
  
  
- #ifndef USDT2
- HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin);
- HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end);
- 
- HS_DTRACE_PROBE_DECL(hs_private, cms__remark__begin);
- HS_DTRACE_PROBE_DECL(hs_private, cms__remark__end);
- #endif /* !USDT2 */
- 
  //////////////////////////////////////////////////////////
  // Methods in abstract class VM_CMS_Operation
  //////////////////////////////////////////////////////////
  void VM_CMS_Operation::acquire_pending_list_lock() {
    // The caller may block while communicating
--- 33,42 ----
*** 136,150 ****
  void VM_CMS_Initial_Mark::doit() {
    if (lost_race()) {
      // Nothing to do.
      return;
    }
- #ifndef USDT2
-   HS_DTRACE_PROBE(hs_private, cms__initmark__begin);
- #else /* USDT2 */
    HS_PRIVATE_CMS_INITMARK_BEGIN();
- #endif /* USDT2 */
  
    _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
--- 128,138 ----
*** 156,185 ****
  
    VM_CMS_Operation::verify_after_gc();
  
    _collector->_gc_timer_cm->register_gc_pause_end();
  
- #ifndef USDT2
-   HS_DTRACE_PROBE(hs_private, cms__initmark__end);
- #else /* USDT2 */
    HS_PRIVATE_CMS_INITMARK_END();
- #endif /* USDT2 */
  }
  
  //////////////////////////////////////////////////////////
  // Methods in class VM_CMS_Final_Remark_Operation
  //////////////////////////////////////////////////////////
  void VM_CMS_Final_Remark::doit() {
    if (lost_race()) {
      // Nothing to do.
      return;
    }
- #ifndef USDT2
-   HS_DTRACE_PROBE(hs_private, cms__remark__begin);
- #else /* USDT2 */
    HS_PRIVATE_CMS_REMARK_BEGIN();
- #endif /* USDT2 */
  
    _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
--- 144,165 ----
*** 192,206 ****
    VM_CMS_Operation::verify_after_gc();
  
    _collector->save_heap_summary();
    _collector->_gc_timer_cm->register_gc_pause_end();
  
- #ifndef USDT2
-   HS_DTRACE_PROBE(hs_private, cms__remark__end);
- #else /* USDT2 */
    HS_PRIVATE_CMS_REMARK_END();
- #endif /* USDT2 */
  }
  
  // VM operation to invoke a concurrent collection of a
  // GenCollectedHeap heap.
  void VM_GenCollectFullConcurrent::doit() {
--- 172,182 ----