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

rev 53416 : imported patch 8217330-split-collectionsetchooser
rev 53417 : [mq]: 8217330-leo-review
rev 53418 : imported patch 8217328-rename-collectionsetchooser

*** 21,34 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/collectionSetChooser.hpp"
  #include "gc/g1/g1Analytics.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1ConcurrentMark.hpp"
  #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
  #include "gc/g1/g1HeterogeneousHeapPolicy.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
--- 21,34 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1Analytics.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
+ #include "gc/g1/g1CollectionSetChooser.hpp"
  #include "gc/g1/g1ConcurrentMark.hpp"
  #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
  #include "gc/g1/g1ConcurrentRefine.hpp"
  #include "gc/g1/g1HeterogeneousHeapPolicy.hpp"
  #include "gc/g1/g1HotCardCache.hpp"
*** 1025,1035 ****
      }
    }
  }
  
  void G1Policy::record_concurrent_mark_cleanup_end() {
!   G1CollectionSetCandidates* candidates = CollectionSetChooser::build(_g1h->workers(), _g1h->num_regions());
    _collection_set->set_candidates(candidates);
  
    bool mixed_gc_pending = next_gc_should_be_mixed("request mixed gcs", "request young-only gcs");
    if (!mixed_gc_pending) {
      clear_collection_set_candidates();
--- 1025,1035 ----
      }
    }
  }
  
  void G1Policy::record_concurrent_mark_cleanup_end() {
!   G1CollectionSetCandidates* candidates = G1CollectionSetChooser::build(_g1h->workers(), _g1h->num_regions());
    _collection_set->set_candidates(candidates);
  
    bool mixed_gc_pending = next_gc_should_be_mixed("request mixed gcs", "request young-only gcs");
    if (!mixed_gc_pending) {
      clear_collection_set_candidates();