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

rev 53416 : imported patch 8217330-split-collectionsetchooser
rev 53418 : imported patch 8217328-rename-collectionsetchooser

*** 21,32 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/collectionSetChooser.hpp"
  #include "gc/g1/g1CollectionSetCandidates.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  
  HeapRegion* G1CollectionSetCandidates::pop_front() {
    assert(_front_idx < _num_regions, "pre-condition");
    HeapRegion* hr = _regions[_front_idx];
--- 21,32 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectionSetCandidates.hpp"
+ #include "gc/g1/g1CollectionSetChooser.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  
  HeapRegion* G1CollectionSetCandidates::pop_front() {
    assert(_front_idx < _num_regions, "pre-condition");
    HeapRegion* hr = _regions[_front_idx];
*** 71,81 ****
    }
    HeapRegion *prev = NULL;
    for (; idx < _num_regions; idx++) {
      HeapRegion *cur = _regions[idx];
      guarantee(cur != NULL, "Regions after _front_idx %u cannot be NULL but %u is", _front_idx, idx);
!     guarantee(CollectionSetChooser::should_add(cur), "Region %u should be eligible for addition.", cur->hrm_index());
      if (prev != NULL) {
        guarantee(prev->gc_efficiency() >= cur->gc_efficiency(),
                  "GC efficiency for region %u: %1.4f smaller than for region %u: %1.4f",
                  prev->hrm_index(), prev->gc_efficiency(), cur->hrm_index(), cur->gc_efficiency());
      }
--- 71,81 ----
    }
    HeapRegion *prev = NULL;
    for (; idx < _num_regions; idx++) {
      HeapRegion *cur = _regions[idx];
      guarantee(cur != NULL, "Regions after _front_idx %u cannot be NULL but %u is", _front_idx, idx);
!     guarantee(G1CollectionSetChooser::should_add(cur), "Region %u should be eligible for addition.", cur->hrm_index());
      if (prev != NULL) {
        guarantee(prev->gc_efficiency() >= cur->gc_efficiency(),
                  "GC efficiency for region %u: %1.4f smaller than for region %u: %1.4f",
                  prev->hrm_index(), prev->gc_efficiency(), cur->hrm_index(), cur->gc_efficiency());
      }