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

*** 24,38 ****
--- 24,40 ----
  
  #include "precompiled.hpp"
  #include "code/nmethod.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1HeapRegionTraceType.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionBounds.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
+ #include "gc/g1/heapRegionTracer.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/liveRange.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "logging/log.hpp"
  #include "memory/iterator.hpp"
*** 210,223 ****
--- 212,256 ----
    double region_elapsed_time_ms =
      g1p->predict_region_elapsed_time_ms(this, false /* for_young_gc */);
    _gc_efficiency = (double) reclaimable_bytes() / region_elapsed_time_ms;
  }
  
+ void HeapRegion::set_free() {
+   report_region_type_change(G1HeapRegionTraceType::Free);
+   _type.set_free();
+ }
+ 
+ void HeapRegion::set_eden() {
+   report_region_type_change(G1HeapRegionTraceType::Eden);
+   _type.set_eden();
+ }
+ 
+ void HeapRegion::set_eden_pre_gc() {
+   report_region_type_change(G1HeapRegionTraceType::Eden);
+   _type.set_eden_pre_gc();
+ }
+ 
+ void HeapRegion::set_survivor() {
+   report_region_type_change(G1HeapRegionTraceType::Survivor);
+   _type.set_survivor();
+ }
+ 
+ void HeapRegion::set_old() {
+   report_region_type_change(G1HeapRegionTraceType::Old);
+   _type.set_old();
+ }
+ 
+ void HeapRegion::set_archive() {
+   report_region_type_change(G1HeapRegionTraceType::Archive);
+   _type.set_archive();
+ }
+ 
  void HeapRegion::set_starts_humongous(HeapWord* obj_top, size_t fill_size) {
    assert(!is_humongous(), "sanity / pre-condition");
    assert(top() == bottom(), "should be empty");
  
+   report_region_type_change(G1HeapRegionTraceType::StartsHumongous);
    _type.set_starts_humongous();
    _humongous_start_region = this;
  
    _bot_part.set_for_starts_humongous(obj_top, fill_size);
  }
*** 225,234 ****
--- 258,268 ----
  void HeapRegion::set_continues_humongous(HeapRegion* first_hr) {
    assert(!is_humongous(), "sanity / pre-condition");
    assert(top() == bottom(), "should be empty");
    assert(first_hr->is_starts_humongous(), "pre-condition");
  
+   report_region_type_change(G1HeapRegionTraceType::ContinuesHumongous);
    _type.set_continues_humongous();
    _humongous_start_region = first_hr;
  }
  
  void HeapRegion::clear_humongous() {
*** 270,279 ****
--- 304,322 ----
    hr_clear(false /*par*/, false /*clear_space*/);
    set_top(bottom());
    record_timestamp();
  }
  
+ void HeapRegion::report_region_type_change(G1HeapRegionTraceType::Type to) {
+   HeapRegionTracer::send_region_type_change(_hrm_index,
+                                             get_trace_type(),
+                                             to,
+                                             (uintptr_t)bottom(),
+                                             used(),
+                                             (uint)allocation_context());
+ }
+ 
  CompactibleSpace* HeapRegion::next_compaction_space() const {
    return G1CollectedHeap::heap()->next_compaction_region(this);
  }
  
  void HeapRegion::note_self_forwarding_removal_start(bool during_initial_mark,