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

rev 56673 : imported patch 8227739-merge-scan-rs-update-rs-cost

*** 25,34 ****
--- 25,35 ----
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectionSetCandidates.hpp"
  #include "gc/g1/g1CollectorState.hpp"
+ #include "gc/g1/g1HotCardCache.hpp"
  #include "gc/g1/g1ParScanThreadState.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/heapRegionSet.hpp"
*** 407,417 ****
    finalize_incremental_building();
  
    guarantee(target_pause_time_ms > 0.0,
              "target_pause_time_ms = %1.6lf should be positive", target_pause_time_ms);
  
!   size_t pending_cards = _policy->pending_cards_at_gc_start();
    double base_time_ms = _policy->predict_base_elapsed_time_ms(pending_cards);
    double time_remaining_ms = MAX2(target_pause_time_ms - base_time_ms, 0.0);
  
    log_trace(gc, ergo, cset)("Start choosing CSet. pending cards: " SIZE_FORMAT " predicted base time: %1.2fms remaining time: %1.2fms target pause time: %1.2fms",
                              pending_cards, base_time_ms, time_remaining_ms, target_pause_time_ms);
--- 408,418 ----
    finalize_incremental_building();
  
    guarantee(target_pause_time_ms > 0.0,
              "target_pause_time_ms = %1.6lf should be positive", target_pause_time_ms);
  
!   size_t pending_cards = _policy->pending_cards_at_gc_start() + _g1h->hot_card_cache()->num_entries();
    double base_time_ms = _policy->predict_base_elapsed_time_ms(pending_cards);
    double time_remaining_ms = MAX2(target_pause_time_ms - base_time_ms, 0.0);
  
    log_trace(gc, ergo, cset)("Start choosing CSet. pending cards: " SIZE_FORMAT " predicted base time: %1.2fms remaining time: %1.2fms target pause time: %1.2fms",
                              pending_cards, base_time_ms, time_remaining_ms, target_pause_time_ms);