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

rev 9431 : dihop-changes
rev 9433 : imported patch erik-jmasa-review
rev 9434 : imported patch fix-evac-failure-needs-stats
rev 9435 : imported patch mikael-erik-review
rev 9436 : [mq]: 8136678-implement-adaptive-sizing-algorithm-for-IHOP
rev 9438 : imported patch erik-jon-review2

@@ -1238,12 +1238,20 @@
 
   _collectionSetChooser->verify();
 }
 
 G1IHOPControl* G1CollectorPolicy::create_ihop_control() const {
+  if (G1UseAdaptiveIHOP) {
+    return new G1AdaptiveIHOPControl(InitiatingHeapOccupancyPercent,
+                                     G1CollectedHeap::heap()->max_capacity(),
+                                     &_predictor,
+                                     G1ReservePercent,
+                                     G1HeapWastePercent);
+  } else {
   return new G1StaticIHOPControl(InitiatingHeapOccupancyPercent,
                                  G1CollectedHeap::heap()->max_capacity());
+  }
 }
 
 void G1CollectorPolicy::update_ihop_prediction(double mutator_time_s,
                                                size_t mutator_alloc_bytes,
                                                size_t young_gen_size) {