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

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2012, 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) 2005, 2013, 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.
*** 24,36 ****
--- 24,39 ----
  
  #include "precompiled.hpp"
  #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp"
  #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
  #include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
+ #include "gc_implementation/shared/gcTimer.hpp"
+ #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_implementation/shared/isGCActiveMark.hpp"
  #include "memory/gcLocker.inline.hpp"
  #include "runtime/interfaceSupport.hpp"
+ #include "runtime/os.hpp"
  #include "utilities/dtrace.hpp"
  
  
  #ifndef USDT2
  HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin);
*** 58,67 ****
--- 61,71 ----
  }
  
  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);
      Universe::heap()->prepare_for_verify();
      Universe::verify();
*** 69,78 ****
--- 73,83 ----
  }
  
  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();
    }
*** 138,156 ****
--- 143,166 ----
  #else /* USDT2 */
    HS_PRIVATE_CMS_INITMARK_BEGIN(
                                  );
  #endif /* USDT2 */
  
+   _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark", os::elapsed_counter());
+ 
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
  
    VM_CMS_Operation::verify_before_gc();
  
    IsGCActiveMark x; // stop-world GC active
    _collector->do_CMS_operation(CMSCollector::CMS_op_checkpointRootsInitial, gch->gc_cause());
  
    VM_CMS_Operation::verify_after_gc();
+ 
+   _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+ 
  #ifndef USDT2
    HS_DTRACE_PROBE(hs_private, cms__initmark__end);
  #else /* USDT2 */
    HS_PRIVATE_CMS_INITMARK_END(
                                  );
*** 170,188 ****
--- 180,204 ----
  #else /* USDT2 */
    HS_PRIVATE_CMS_REMARK_BEGIN(
                                  );
  #endif /* USDT2 */
  
+   _collector->_gc_timer_cm->register_gc_pause_start("Final Mark", os::elapsed_counter());
+ 
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
  
    VM_CMS_Operation::verify_before_gc();
  
    IsGCActiveMark x; // stop-world GC active
    _collector->do_CMS_operation(CMSCollector::CMS_op_checkpointRootsFinal, gch->gc_cause());
  
    VM_CMS_Operation::verify_after_gc();
+ 
+   _collector->save_heap_summary();
+   _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+ 
  #ifndef USDT2
    HS_DTRACE_PROBE(hs_private, cms__remark__end);
  #else /* USDT2 */
    HS_PRIVATE_CMS_REMARK_END(
                                  );
*** 223,233 ****
      CMSCollector::disable_icms();
      _disabled_icms = true;
      // In case CMS thread was in icms_wait(), wake it up.
      CMSCollector::start_icms();
      // Nudge the CMS thread to start a concurrent collection.
!     CMSCollector::request_full_gc(_full_gc_count_before);
    } else {
      assert(_full_gc_count_before < gch->total_full_collections(), "Error");
      FullGCCount_lock->notify_all();  // Inform the Java thread its work is done
    }
  }
--- 239,249 ----
      CMSCollector::disable_icms();
      _disabled_icms = true;
      // In case CMS thread was in icms_wait(), wake it up.
      CMSCollector::start_icms();
      // Nudge the CMS thread to start a concurrent collection.
!     CMSCollector::request_full_gc(_full_gc_count_before, _gc_cause);
    } else {
      assert(_full_gc_count_before < gch->total_full_collections(), "Error");
      FullGCCount_lock->notify_all();  // Inform the Java thread its work is done
    }
  }