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

rev 5733 : 8030812: Change the solaris DTrace implementation to use USDT2 instead of USDT1
Reviewed-by:

*** 139,150 ****
      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();
--- 139,149 ----
      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();
*** 160,171 ****
    _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
--- 159,169 ----
    _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
*** 176,187 ****
      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();
--- 174,184 ----
      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();
*** 198,209 ****
    _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.
--- 195,205 ----
    _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.