src/share/vm/gc/cms/vmCMSOperations.cpp

*** 56,66 ****
  }
  
  void VM_CMS_Operation::verify_before_gc() {
    if (VerifyBeforeGC &&
        GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
!     GCTraceTime tm("Verify Before", false, false, _collector->_gc_timer_cm, _collector->_gc_tracer_cm->gc_id());
      HandleMark hm;
      FreelistLocker x(_collector);
      MutexLockerEx  y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
      GenCollectedHeap::heap()->prepare_for_verify();
      Universe::verify();
--- 56,66 ----
  }
  
  void VM_CMS_Operation::verify_before_gc() {
    if (VerifyBeforeGC &&
        GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
!     GCTraceTime tm("Verify Before", false, false, _collector->_gc_timer_cm);
      HandleMark hm;
      FreelistLocker x(_collector);
      MutexLockerEx  y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
      GenCollectedHeap::heap()->prepare_for_verify();
      Universe::verify();
*** 68,78 ****
  }
  
  void VM_CMS_Operation::verify_after_gc() {
    if (VerifyAfterGC &&
        GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
!     GCTraceTime tm("Verify After", false, false, _collector->_gc_timer_cm, _collector->_gc_tracer_cm->gc_id());
      HandleMark hm;
      FreelistLocker x(_collector);
      MutexLockerEx  y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
      Universe::verify();
    }
--- 68,78 ----
  }
  
  void VM_CMS_Operation::verify_after_gc() {
    if (VerifyAfterGC &&
        GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
!     GCTraceTime tm("Verify After", false, false, _collector->_gc_timer_cm);
      HandleMark hm;
      FreelistLocker x(_collector);
      MutexLockerEx  y(_collector->bitMapLock(), Mutex::_no_safepoint_check_flag);
      Universe::verify();
    }
*** 132,141 ****
--- 132,142 ----
    if (lost_race()) {
      // Nothing to do.
      return;
    }
    HS_PRIVATE_CMS_INITMARK_BEGIN();
+   GCIdMark gc_id_mark(_gc_id);
  
    _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
*** 159,168 ****
--- 160,170 ----
    if (lost_race()) {
      // Nothing to do.
      return;
    }
    HS_PRIVATE_CMS_REMARK_BEGIN();
+   GCIdMark gc_id_mark(_gc_id);
  
    _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_final_remark);