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

*** 1060,1077 ****
    }
  
    _short_lived_surv_rate_group->start_adding_regions();
    // Do that for any other surv rate groups
  
    if (update_stats) {
      double cost_per_card_ms = 0.0;
-     double cost_scan_hcc = average_time_ms(G1GCPhaseTimes::ScanHCC);
      if (_pending_cards > 0) {
!       cost_per_card_ms = (average_time_ms(G1GCPhaseTimes::UpdateRS) - cost_scan_hcc) / (double) _pending_cards;
        _cost_per_card_ms_seq->add(cost_per_card_ms);
      }
!     _cost_scan_hcc_seq->add(cost_scan_hcc);
  
      double cost_per_entry_ms = 0.0;
      if (cards_scanned > 10) {
        cost_per_entry_ms = average_time_ms(G1GCPhaseTimes::ScanRS) / (double) cards_scanned;
        if (collector_state()->last_gc_was_young()) {
--- 1060,1078 ----
    }
  
    _short_lived_surv_rate_group->start_adding_regions();
    // Do that for any other surv rate groups
  
+   double scan_hcc_time_ms = ConcurrentG1Refine::hot_card_cache_enabled() ? average_time_ms(G1GCPhaseTimes::ScanHCC) : 0.0;
+ 
    if (update_stats) {
      double cost_per_card_ms = 0.0;
      if (_pending_cards > 0) {
!       cost_per_card_ms = (average_time_ms(G1GCPhaseTimes::UpdateRS) - scan_hcc_time_ms) / (double) _pending_cards;
        _cost_per_card_ms_seq->add(cost_per_card_ms);
      }
!     _cost_scan_hcc_seq->add(scan_hcc_time_ms);
  
      double cost_per_entry_ms = 0.0;
      if (cards_scanned > 10) {
        cost_per_entry_ms = average_time_ms(G1GCPhaseTimes::ScanRS) / (double) cards_scanned;
        if (collector_state()->last_gc_was_young()) {
*** 1157,1168 ****
    _ihop_control->send_trace_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;
  
-   double scan_hcc_time_ms = average_time_ms(G1GCPhaseTimes::ScanHCC);
- 
    if (update_rs_time_goal_ms < scan_hcc_time_ms) {
      log_debug(gc, ergo, refine)("Adjust concurrent refinement thresholds (scanning the HCC expected to take longer than Update RS time goal)."
                                  "Update RS time goal: %1.2fms Scan HCC time: %1.2fms",
                                  update_rs_time_goal_ms, scan_hcc_time_ms);
  
--- 1158,1167 ----