--- old/src/share/vm/gc/g1/g1CollectorPolicy.cpp	2015-11-11 15:15:46.080261943 +0100
+++ new/src/share/vm/gc/g1/g1CollectorPolicy.cpp	2015-11-11 15:15:45.997259478 +0100
@@ -1219,7 +1219,7 @@
   }
   _last_old_allocated_bytes = 0;
 
-  _ihop_control->send_jfr_event(_g1->gc_tracer_stw());
+  _ihop_control->send_event(_g1->gc_tracer_stw());
 
   // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
   double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
--- old/src/share/vm/gc/g1/g1IHOPControl.cpp	2015-11-11 15:15:46.569276466 +0100
+++ new/src/share/vm/gc/g1/g1IHOPControl.cpp	2015-11-11 15:15:46.484273941 +0100
@@ -60,7 +60,7 @@
                 _last_marking_length_s);
 }
 
-void G1StaticIHOPControl::send_jfr_event(G1NewTracer* tracer) {
+void G1StaticIHOPControl::send_event(G1NewTracer* tracer) {
   tracer->report_basic_ihop_statistics(get_conc_mark_start_threshold(),
                                        _target_occupancy,
                                        G1CollectedHeap::heap()->used(),
@@ -194,7 +194,7 @@
                 );
 }
 
-void G1AdaptiveIHOPControl::send_jfr_event(G1NewTracer* tracer) {
+void G1AdaptiveIHOPControl::send_event(G1NewTracer* tracer) {
   tracer->report_basic_ihop_statistics(get_conc_mark_start_threshold(),
                                        _target_occupancy,
                                        G1CollectedHeap::heap()->used(),
--- old/src/share/vm/gc/g1/g1IHOPControl.hpp	2015-11-11 15:15:47.031290187 +0100
+++ new/src/share/vm/gc/g1/g1IHOPControl.hpp	2015-11-11 15:15:46.949287751 +0100
@@ -54,7 +54,7 @@
   virtual void update_time_to_mixed(double marking_length_s) = 0;
 
   virtual void print() = 0;
-  virtual void send_jfr_event(G1NewTracer* tracer) = 0;
+  virtual void send_event(G1NewTracer* tracer) = 0;
 };
 
 class G1StaticIHOPControl : public G1IHOPControl {
@@ -78,7 +78,7 @@
   }
 
   virtual void print();
-  virtual void send_jfr_event(G1NewTracer* tracer);
+  virtual void send_event(G1NewTracer* tracer);
 #ifndef PRODUCT
   static void test();
 #endif
@@ -110,7 +110,7 @@
   virtual void update_time_to_mixed(double marking_length_s);
 
   virtual void print();
-  virtual void send_jfr_event(G1NewTracer* tracer);
+  virtual void send_event(G1NewTracer* tracer);
 #ifndef PRODUCT
   static void test();
 #endif
--- old/src/share/vm/gc/shared/gcTrace.hpp	2015-11-11 15:15:47.519304680 +0100
+++ new/src/share/vm/gc/shared/gcTrace.hpp	2015-11-11 15:15:47.435302185 +0100
@@ -261,9 +261,9 @@
                                     double last_allocation_duration,
                                     double last_marking_length);
   void report_adaptive_ihop_statistics(size_t additional_buffer_size,
-                                      double predicted_allocation_rate,
-                                      double predicted_marking_length,
-                                      bool prediction_active);
+                                       double predicted_allocation_rate,
+                                       double predicted_marking_length,
+                                       bool prediction_active);
  private:
   void send_g1_young_gc_event();
   void send_evacuation_info_event(EvacuationInfo* info);
--- old/src/share/vm/gc/shared/gcTraceSend.cpp	2015-11-11 15:15:47.997318876 +0100
+++ new/src/share/vm/gc/shared/gcTraceSend.cpp	2015-11-11 15:15:47.914316411 +0100
@@ -270,7 +270,7 @@
 void G1NewTracer::send_basic_ihop_statistics(size_t threshold,
                                              size_t target_occupancy,
                                              size_t current_occupancy,
-                                             size_t last_allocation_ize,
+                                             size_t last_allocation_size,
                                              double last_allocation_duration,
                                              double last_marking_length) {
   EventGCG1BasicIHOP evt;
@@ -278,11 +278,11 @@
     evt.set_gcId(GCId::current());
     evt.set_threshold(threshold);
     evt.set_targetOccupancy(target_occupancy);
-    evt.set_thresholdPercentage(threshold * 100.0 / target_occupancy);
+    evt.set_thresholdPercentage(target_occupancy > 0 ? threshold * 100.0 / target_occupancy : 0.0);
     evt.set_currentOccupancy(current_occupancy);
-    evt.set_lastAllocationSize(last_allocation_ize);
+    evt.set_lastAllocationSize(last_allocation_size);
     evt.set_lastAllocationDuration(last_allocation_duration);
-    evt.set_lastAllocationRate(last_allocation_duration != 0.0 ? last_allocation_ize / last_allocation_duration : 0.0);
+    evt.set_lastAllocationRate(last_allocation_duration != 0.0 ? last_allocation_size / last_allocation_duration : 0.0);
     evt.set_lastMarkingLength(last_marking_length);
     evt.commit();
   }