src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 627,636 ****
--- 627,637 ----
      }
    }
  
    NOT_PRODUCT(_overflow_counter = CMSMarkStackOverflowInterval;)
    _gc_counters = new CollectorCounters("CMS", 1);
+   _cgc_counters = new CollectorCounters("CMS stop-the-world phases", 2);
    _completed_initialization = true;
    _inter_sweep_timer.start();  // start of time
  }
  
  const char* ConcurrentMarkSweepGeneration::name() const {
*** 5557,5578 ****
    register_gc_end();
  }
  
  void CMSCollector::do_CMS_operation(CMS_op_type op, GCCause::Cause gc_cause) {
    GCTraceCPUTime tcpu;
!   TraceCollectorStats tcs(counters());
  
    switch (op) {
      case CMS_op_checkpointRootsInitial: {
        GCTraceTime(Info, gc) t("Pause Initial Mark", NULL, GCCause::_no_gc, true);
!       SvcGCMarker sgcm(SvcGCMarker::OTHER);
        checkpointRootsInitial();
        break;
      }
      case CMS_op_checkpointRootsFinal: {
        GCTraceTime(Info, gc) t("Pause Remark", NULL, GCCause::_no_gc, true);
!       SvcGCMarker sgcm(SvcGCMarker::OTHER);
        checkpointRootsFinal();
        break;
      }
      default:
        fatal("No such CMS_op");
--- 5558,5579 ----
    register_gc_end();
  }
  
  void CMSCollector::do_CMS_operation(CMS_op_type op, GCCause::Cause gc_cause) {
    GCTraceCPUTime tcpu;
!   TraceCollectorStats tcs_cgc(cgc_counters());
  
    switch (op) {
      case CMS_op_checkpointRootsInitial: {
        GCTraceTime(Info, gc) t("Pause Initial Mark", NULL, GCCause::_no_gc, true);
!       SvcGCMarker sgcm(SvcGCMarker::CONCURRENT);
        checkpointRootsInitial();
        break;
      }
      case CMS_op_checkpointRootsFinal: {
        GCTraceTime(Info, gc) t("Pause Remark", NULL, GCCause::_no_gc, true);
!       SvcGCMarker sgcm(SvcGCMarker::CONCURRENT);
        checkpointRootsFinal();
        break;
      }
      default:
        fatal("No such CMS_op");