1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Aug 19 12:39:06 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Aug 19 10:50:27 2014 +0200
1.3 @@ -455,7 +455,7 @@
1.4 } else {
1.5 _young_list_fixed_length = _young_gen_sizer->min_desired_young_length();
1.6 }
1.7 - _free_regions_at_end_of_collection = _g1->free_regions();
1.8 + _free_regions_at_end_of_collection = _g1->num_free_regions();
1.9 update_young_list_target_length();
1.10
1.11 // We may immediately start allocating regions and placing them on the
1.12 @@ -828,7 +828,7 @@
1.13
1.14 record_survivor_regions(0, NULL, NULL);
1.15
1.16 - _free_regions_at_end_of_collection = _g1->free_regions();
1.17 + _free_regions_at_end_of_collection = _g1->num_free_regions();
1.18 // Reset survivors SurvRateGroup.
1.19 _survivor_surv_rate_group->reset();
1.20 update_young_list_target_length();
1.21 @@ -1180,7 +1180,7 @@
1.22
1.23 _in_marking_window = new_in_marking_window;
1.24 _in_marking_window_im = new_in_marking_window_im;
1.25 - _free_regions_at_end_of_collection = _g1->free_regions();
1.26 + _free_regions_at_end_of_collection = _g1->num_free_regions();
1.27 update_young_list_target_length();
1.28
1.29 // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
1.30 @@ -1202,7 +1202,7 @@
1.31 _survivor_used_bytes_before_gc = young_list->survivor_used_bytes();
1.32 _heap_capacity_bytes_before_gc = _g1->capacity();
1.33 _heap_used_bytes_before_gc = _g1->used();
1.34 - _cur_collection_pause_used_regions_at_start = _g1->used_regions();
1.35 + _cur_collection_pause_used_regions_at_start = _g1->num_used_regions();
1.36
1.37 _eden_capacity_bytes_before_gc =
1.38 (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_used_bytes_before_gc;
1.39 @@ -1617,7 +1617,7 @@
1.40 G1CollectorPolicy::record_concurrent_mark_cleanup_end(int no_of_gc_threads) {
1.41 _collectionSetChooser->clear();
1.42
1.43 - uint region_num = _g1->n_regions();
1.44 + uint region_num = _g1->num_regions();
1.45 if (G1CollectedHeap::use_parallel_gc_threads()) {
1.46 const uint OverpartitionFactor = 4;
1.47 uint WorkUnit;
1.48 @@ -1638,7 +1638,7 @@
1.49 MAX2(region_num / (uint) (ParallelGCThreads * OverpartitionFactor),
1.50 MinWorkUnit);
1.51 }
1.52 - _collectionSetChooser->prepare_for_par_region_addition(_g1->n_regions(),
1.53 + _collectionSetChooser->prepare_for_par_region_addition(_g1->num_regions(),
1.54 WorkUnit);
1.55 ParKnownGarbageTask parKnownGarbageTask(_collectionSetChooser,
1.56 (int) WorkUnit);
1.57 @@ -1935,7 +1935,7 @@
1.58 // of them are available.
1.59
1.60 G1CollectedHeap* g1h = G1CollectedHeap::heap();
1.61 - const size_t region_num = g1h->n_regions();
1.62 + const size_t region_num = g1h->num_regions();
1.63 const size_t perc = (size_t) G1OldCSetRegionThresholdPercent;
1.64 size_t result = region_num * perc / 100;
1.65 // emulate ceiling
