src/share/vm/gc/g1/concurrentMarkThread.cpp

*** 28,37 ****
--- 28,38 ----
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/g1Log.hpp"
  #include "gc/g1/g1MMUTracker.hpp"
  #include "gc/g1/suspendibleThreadSet.hpp"
  #include "gc/g1/vm_operations_g1.hpp"
+ #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "memory/resourceArea.hpp"
  #include "runtime/vmThread.hpp"
  
  // ======= Concurrent Mark Thread ========
*** 83,93 ****
  void ConcurrentMarkThread::cm_log(bool doit, bool join_sts, const char* fmt, ...) {
    if (doit) {
      SuspendibleThreadSetJoiner sts_joiner(join_sts);
      va_list args;
      va_start(args, fmt);
!     gclog_or_tty->gclog_stamp(cm()->concurrent_gc_id());
      gclog_or_tty->vprint_cr(fmt, args);
      va_end(args);
    }
  }
  
--- 84,94 ----
  void ConcurrentMarkThread::cm_log(bool doit, bool join_sts, const char* fmt, ...) {
    if (doit) {
      SuspendibleThreadSetJoiner sts_joiner(join_sts);
      va_list args;
      va_start(args, fmt);
!     gclog_or_tty->gclog_stamp();
      gclog_or_tty->vprint_cr(fmt, args);
      va_end(args);
    }
  }
  
*** 106,115 ****
--- 107,117 ----
      sleepBeforeNextCycle();
      if (_should_terminate) {
        break;
      }
  
+     GCIdMark gc_id_mark;
      {
        ResourceMark rm;
        HandleMark   hm;
        double cycle_start = os::elapsedVTime();