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

rev 10472 : 8151711: Move G1 number sequences out of the G1 collector policy
Reviewed-by:
rev 10473 : [mq]: rename-to-analytics

*** 23,32 ****
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "classfile/classLoaderData.hpp"
  #include "gc/g1/concurrentMarkThread.inline.hpp"
+ #include "gc/g1/g1Analytics.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/g1MMUTracker.hpp"
  #include "gc/g1/suspendibleThreadSet.hpp"
  #include "gc/g1/vm_operations_g1.hpp"
*** 80,93 ****
    }
  };
  
  // Marking pauses can be scheduled flexibly, so we might delay marking to meet MMU.
  void ConcurrentMarkThread::delay_to_keep_mmu(G1CollectorPolicy* g1_policy, bool remark) {
    if (g1_policy->adaptive_young_list_length()) {
      double now = os::elapsedTime();
!     double prediction_ms = remark ? g1_policy->predict_remark_time_ms()
!                                   : g1_policy->predict_cleanup_time_ms();
      G1MMUTracker *mmu_tracker = g1_policy->mmu_tracker();
      jlong sleep_time_ms = mmu_tracker->when_ms(now, prediction_ms);
      os::sleep(this, sleep_time_ms, false);
    }
  }
--- 81,95 ----
    }
  };
  
  // Marking pauses can be scheduled flexibly, so we might delay marking to meet MMU.
  void ConcurrentMarkThread::delay_to_keep_mmu(G1CollectorPolicy* g1_policy, bool remark) {
+   const G1Analytics* analytics = g1_policy->analytics();
    if (g1_policy->adaptive_young_list_length()) {
      double now = os::elapsedTime();
!     double prediction_ms = remark ? analytics->predict_remark_time_ms()
!                                   : analytics->predict_cleanup_time_ms();
      G1MMUTracker *mmu_tracker = g1_policy->mmu_tracker();
      jlong sleep_time_ms = mmu_tracker->when_ms(now, prediction_ms);
      os::sleep(this, sleep_time_ms, false);
    }
  }