src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.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) 2001, 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) 2001, 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.
*** 33,42 ****
--- 33,44 ----
  #include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #include "gc_implementation/parallelScavenge/vmPSOperations.hpp"
+ #include "gc_implementation/shared/gcHeapSummary.hpp"
+ #include "gc_implementation/shared/gcWhen.hpp"
  #include "memory/gcLocker.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/vmThread.hpp"
*** 640,649 ****
--- 642,674 ----
  
  void ParallelScavengeHeap::prepare_for_verify() {
    ensure_parsability(false);  // no need to retire TLABs for verification
  }
  
+ PSHeapSummary ParallelScavengeHeap::create_ps_heap_summary() {
+   PSOldGen* old = old_gen();
+   HeapWord* old_committed_end = (HeapWord*)old->virtual_space()->committed_high_addr();
+   VirtualSpaceSummary old_summary(old->reserved().start(), old_committed_end, old->reserved().end());
+   SpaceSummary old_space(old->reserved().start(), old_committed_end, old->used_in_bytes());
+ 
+   PSYoungGen* young = young_gen();
+   VirtualSpaceSummary young_summary(young->reserved().start(),
+     (HeapWord*)young->virtual_space()->committed_high_addr(), young->reserved().end());
+ 
+   MutableSpace* eden = young_gen()->eden_space();
+   SpaceSummary eden_space(eden->bottom(), eden->end(), eden->used_in_bytes());
+ 
+   MutableSpace* from = young_gen()->from_space();
+   SpaceSummary from_space(from->bottom(), from->end(), from->used_in_bytes());
+ 
+   MutableSpace* to = young_gen()->to_space();
+   SpaceSummary to_space(to->bottom(), to->end(), to->used_in_bytes());
+ 
+   VirtualSpaceSummary heap_summary = create_heap_space_summary();
+   return PSHeapSummary(heap_summary, used(), old_summary, old_space, young_summary, eden_space, from_space, to_space);
+ }
+ 
  void ParallelScavengeHeap::print_on(outputStream* st) const {
    young_gen()->print_on(st);
    old_gen()->print_on(st);
    MetaspaceAux::print_on(st);
  }
*** 704,713 ****
--- 729,744 ----
                          "("  SIZE_FORMAT "K)",
                          prev_used / K, used() / K, capacity() / K);
    }
  }
  
+ void ParallelScavengeHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) {
+   const PSHeapSummary& heap_summary = create_ps_heap_summary();
+   const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
+   gc_tracer->report_gc_heap_summary(when, heap_summary, metaspace_summary);
+ }
+ 
  ParallelScavengeHeap* ParallelScavengeHeap::heap() {
    assert(_psh != NULL, "Uninitialized access to ParallelScavengeHeap::heap()");
    assert(_psh->kind() == CollectedHeap::ParallelScavengeHeap, "not a parallel scavenge heap");
    return _psh;
  }