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

rev 49676 : imported patch 8200723-suppress-predictions
rev 49678 : imported patch 8200426-sangheon-review
rev 49681 : imported patch 6672778-refactoring

*** 626,636 ****
    double scan_hcc_time_ms = G1HotCardCache::default_use_cache() ? 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;
        _analytics->report_cost_per_card_ms(cost_per_card_ms);
      }
      _analytics->report_cost_scan_hcc(scan_hcc_time_ms);
  
      double cost_per_entry_ms = 0.0;
--- 626,636 ----
    double scan_hcc_time_ms = G1HotCardCache::default_use_cache() ? 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)) / (double) _pending_cards;
        _analytics->report_cost_per_card_ms(cost_per_card_ms);
      }
      _analytics->report_cost_scan_hcc(scan_hcc_time_ms);
  
      double cost_per_entry_ms = 0.0;
*** 728,738 ****
  
      update_rs_time_goal_ms = 0;
    } else {
      update_rs_time_goal_ms -= scan_hcc_time_ms;
    }
!   _g1h->concurrent_refine()->adjust(average_time_ms(G1GCPhaseTimes::UpdateRS) - scan_hcc_time_ms,
                                     phase_times()->sum_thread_work_items(G1GCPhaseTimes::UpdateRS),
                                     update_rs_time_goal_ms);
  
    cset_chooser()->verify();
  }
--- 728,738 ----
  
      update_rs_time_goal_ms = 0;
    } else {
      update_rs_time_goal_ms -= scan_hcc_time_ms;
    }
!   _g1h->concurrent_refine()->adjust(average_time_ms(G1GCPhaseTimes::UpdateRS),
                                      phase_times()->sum_thread_work_items(G1GCPhaseTimes::UpdateRS),
                                      update_rs_time_goal_ms);
  
    cset_chooser()->verify();
  }