src/share/vm/gc_implementation/g1/concurrentMark.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>

*** 34,43 ****
--- 34,46 ----
  #include "gc_implementation/g1/g1RemSet.hpp"
  #include "gc_implementation/g1/heapRegion.inline.hpp"
  #include "gc_implementation/g1/heapRegionRemSet.hpp"
  #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
  #include "gc_implementation/shared/vmGCOperations.hpp"
+ #include "gc_implementation/shared/gcTimer.hpp"
+ #include "gc_implementation/shared/gcTrace.hpp"
+ #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/referencePolicy.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
*** 1340,1349 ****
--- 1343,1355 ----
    _remark_mark_times.add((mark_work_end - start) * 1000.0);
    _remark_weak_ref_times.add((now - mark_work_end) * 1000.0);
    _remark_times.add((now - start) * 1000.0);
  
    g1p->record_concurrent_mark_remark_end();
+ 
+   G1CMIsAliveClosure is_alive(g1h);
+   g1h->gc_tracer_cm()->report_object_count_after_gc(&is_alive);
  }
  
  // Base class of the closures that finalize and verify the
  // liveness counting data.
  class CMCountDataClosureBase: public HeapRegionClosure {
*** 2127,2136 ****
--- 2133,2143 ----
      Universe::verify(VerifyOption_G1UsePrevMarking,
                       " VerifyDuringGC:(after)");
    }
  
    g1h->verify_region_sets_optional();
+   g1h->trace_heap_after_concurrent_cycle();
  }
  
  void ConcurrentMark::completeCleanup() {
    if (has_aborted()) return;
  
*** 2437,2447 ****
    // tables from the displayed time.
    {
      if (G1Log::finer()) {
        gclog_or_tty->put(' ');
      }
!     TraceTime t("GC ref-proc", G1Log::finer(), false, gclog_or_tty);
  
      ReferenceProcessor* rp = g1h->ref_processor_cm();
  
      // See the comment in G1CollectedHeap::ref_processing_init()
      // about how reference processing currently works in G1.
--- 2444,2454 ----
    // tables from the displayed time.
    {
      if (G1Log::finer()) {
        gclog_or_tty->put(' ');
      }
!     GCTraceTime t("GC ref-proc", G1Log::finer(), false, g1h->gc_timer_cm());
  
      ReferenceProcessor* rp = g1h->ref_processor_cm();
  
      // See the comment in G1CollectedHeap::ref_processing_init()
      // about how reference processing currently works in G1.
*** 2489,2502 ****
      // the number of active workers.  This is OK as long as the discovered
      // Reference lists are balanced (see balance_all_queues() and balance_queues()).
      rp->set_active_mt_degree(active_workers);
  
      // Process the weak references.
      rp->process_discovered_references(&g1_is_alive,
                                        &g1_keep_alive,
                                        &g1_drain_mark_stack,
!                                       executor);
  
      // The do_oop work routines of the keep_alive and drain_marking_stack
      // oop closures will set the has_overflown flag if we overflow the
      // global marking stack.
  
--- 2496,2512 ----
      // the number of active workers.  This is OK as long as the discovered
      // Reference lists are balanced (see balance_all_queues() and balance_queues()).
      rp->set_active_mt_degree(active_workers);
  
      // Process the weak references.
+     const ReferenceProcessorStats& stats =
          rp->process_discovered_references(&g1_is_alive,
                                            &g1_keep_alive,
                                            &g1_drain_mark_stack,
!                                           executor,
!                                           g1h->gc_timer_cm());
!     g1h->gc_tracer_cm()->report_gc_reference_stats(stats);
  
      // The do_oop work routines of the keep_alive and drain_marking_stack
      // oop closures will set the has_overflown flag if we overflow the
      // global marking stack.
  
*** 3225,3234 ****
--- 3235,3247 ----
    // This can be called either during or outside marking, we'll read
    // the expected_active value from the SATB queue set.
    satb_mq_set.set_active_all_threads(
                                   false, /* new active value */
                                   satb_mq_set.is_active() /* expected_active */);
+ 
+   _g1h->trace_heap_after_concurrent_cycle();
+   _g1h->register_concurrent_cycle_end();
  }
  
  static void print_ms_time_info(const char* prefix, const char* name,
                                 NumberSeq& ns) {
    gclog_or_tty->print_cr("%s%5d %12s: total time = %8.2f s (avg = %8.2f ms).",