src/hotspot/share/gc/g1/g1IHOPControl.cpp

rev 60584 : imported patch 8245511-ihop
rev 60585 : [mq]: 8245511-rev1

@@ -58,22 +58,22 @@
                       "recent allocation size: " SIZE_FORMAT "B, recent allocation duration: %1.2fms, recent old gen allocation rate: %1.2fB/s, recent marking phase length: %1.2fms",
                       cur_conc_mark_start_threshold,
                       percent_of(cur_conc_mark_start_threshold, _target_occupancy),
                       _target_occupancy,
                       G1CollectedHeap::heap()->used(),
-                      _old_gen_alloc_tracker->last_period_old_bytes(),
+                      _old_gen_alloc_tracker->last_period_old_gen_bytes(),
                       _last_allocation_time_s * 1000.0,
-                      _last_allocation_time_s > 0.0 ? _old_gen_alloc_tracker->last_period_old_bytes() / _last_allocation_time_s : 0.0,
+                      _last_allocation_time_s > 0.0 ? _old_gen_alloc_tracker->last_period_old_gen_bytes() / _last_allocation_time_s : 0.0,
                       last_marking_length_s() * 1000.0);
 }
 
 void G1IHOPControl::send_trace_event(G1NewTracer* tracer) {
   assert(_target_occupancy > 0, "Target occupancy still not updated yet.");
   tracer->report_basic_ihop_statistics(get_conc_mark_start_threshold(),
                                        _target_occupancy,
                                        G1CollectedHeap::heap()->used(),
-                                       _old_gen_alloc_tracker->last_period_old_bytes(),
+                                       _old_gen_alloc_tracker->last_period_old_gen_bytes(),
                                        _last_allocation_time_s,
                                        last_marking_length_s());
 }
 
 G1StaticIHOPControl::G1StaticIHOPControl(double ihop_percent,

@@ -148,11 +148,11 @@
 }
 
 double G1AdaptiveIHOPControl::last_mutator_period_old_allocation_rate() const {
   assert(_last_allocation_time_s > 0, "This should not be called when the last GC is full");
 
-  return _old_gen_alloc_tracker->last_period_net_survived_old_bytes() / _last_allocation_time_s;
+  return _old_gen_alloc_tracker->last_period_old_gen_growth() / _last_allocation_time_s;
  }
 
 void G1AdaptiveIHOPControl::update_allocation_info(double allocation_time_s,
                                                    size_t additional_buffer_size) {
   G1IHOPControl::update_allocation_info(allocation_time_s, additional_buffer_size);