1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Wed Mar 25 15:50:17 2015 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Fri Dec 19 09:21:06 2014 +0100
1.3 @@ -1437,18 +1437,6 @@
1.4 return young_list_length < young_list_max_length;
1.5 }
1.6
1.7 -uint G1CollectorPolicy::max_regions(int purpose) {
1.8 - switch (purpose) {
1.9 - case GCAllocForSurvived:
1.10 - return _max_survivor_regions;
1.11 - case GCAllocForTenured:
1.12 - return REGIONS_UNLIMITED;
1.13 - default:
1.14 - ShouldNotReachHere();
1.15 - return REGIONS_UNLIMITED;
1.16 - };
1.17 -}
1.18 -
1.19 void G1CollectorPolicy::update_max_gc_locker_expansion() {
1.20 uint expansion_region_num = 0;
1.21 if (GCLockerEdenExpansionPercent > 0) {
1.22 @@ -1683,7 +1671,7 @@
1.23 hr->set_next_in_collection_set(_collection_set);
1.24 _collection_set = hr;
1.25 _collection_set_bytes_used_before += hr->used();
1.26 - _g1->register_region_with_in_cset_fast_test(hr);
1.27 + _g1->register_old_region_with_in_cset_fast_test(hr);
1.28 size_t rs_length = hr->rem_set()->occupied();
1.29 _recorded_rs_lengths += rs_length;
1.30 _old_cset_region_length += 1;
1.31 @@ -1816,7 +1804,7 @@
1.32 hr->set_in_collection_set(true);
1.33 assert( hr->next_in_collection_set() == NULL, "invariant");
1.34
1.35 - _g1->register_region_with_in_cset_fast_test(hr);
1.36 + _g1->register_young_region_with_in_cset_fast_test(hr);
1.37 }
1.38
1.39 // Add the region at the RHS of the incremental cset
