1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Feb 16 14:11:44 2010 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Feb 23 23:13:23 2010 -0500
1.3 @@ -270,14 +270,10 @@
1.4 _concurrent_mark_cleanup_times_ms->add(0.20);
1.5 _tenuring_threshold = MaxTenuringThreshold;
1.6
1.7 - if (G1UseSurvivorSpaces) {
1.8 - // if G1FixedSurvivorSpaceSize is 0 which means the size is not
1.9 - // fixed, then _max_survivor_regions will be calculated at
1.10 - // calculate_young_list_target_config during initialization
1.11 - _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
1.12 - } else {
1.13 - _max_survivor_regions = 0;
1.14 - }
1.15 + // if G1FixedSurvivorSpaceSize is 0 which means the size is not
1.16 + // fixed, then _max_survivor_regions will be calculated at
1.17 + // calculate_young_list_target_config during initialization
1.18 + _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
1.19
1.20 initialize_all();
1.21 }
1.22 @@ -455,7 +451,7 @@
1.23 guarantee( adaptive_young_list_length(), "pre-condition" );
1.24
1.25 double start_time_sec = os::elapsedTime();
1.26 - size_t min_reserve_perc = MAX2((size_t)2, (size_t)G1MinReservePercent);
1.27 + size_t min_reserve_perc = MAX2((size_t)2, (size_t)G1ReservePercent);
1.28 min_reserve_perc = MIN2((size_t) 50, min_reserve_perc);
1.29 size_t reserve_regions =
1.30 (size_t) ((double) min_reserve_perc * (double) _g1->n_regions() / 100.0);
1.31 @@ -1110,10 +1106,7 @@
1.32 size_t short_lived_so_length = _young_list_so_prefix_length;
1.33 _short_lived_surv_rate_group->record_scan_only_prefix(short_lived_so_length);
1.34 tag_scan_only(short_lived_so_length);
1.35 -
1.36 - if (G1UseSurvivorSpaces) {
1.37 - _survivors_age_table.clear();
1.38 - }
1.39 + _survivors_age_table.clear();
1.40
1.41 assert( verify_young_ages(), "region age verification" );
1.42 }
1.43 @@ -1916,7 +1909,7 @@
1.44 calculate_young_list_target_config();
1.45
1.46 // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
1.47 - double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSUpdatePauseFractionPercent / 100.0;
1.48 + double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
1.49 adjust_concurrent_refinement(update_rs_time, update_rs_processed_buffers, update_rs_time_goal_ms);
1.50
1.51 // </NEW PREDICTION>
1.52 @@ -1932,7 +1925,7 @@
1.53 DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
1.54 ConcurrentG1Refine *cg1r = G1CollectedHeap::heap()->concurrent_g1_refine();
1.55
1.56 - if (G1AdaptiveConcRefine) {
1.57 + if (G1UseAdaptiveConcRefinement) {
1.58 const int k_gy = 3, k_gr = 6;
1.59 const double inc_k = 1.1, dec_k = 0.9;
1.60
1.61 @@ -2607,9 +2600,6 @@
1.62 // Calculates survivor space parameters.
1.63 void G1CollectorPolicy::calculate_survivors_policy()
1.64 {
1.65 - if (!G1UseSurvivorSpaces) {
1.66 - return;
1.67 - }
1.68 if (G1FixedSurvivorSpaceSize == 0) {
1.69 _max_survivor_regions = _young_list_target_length / SurvivorRatio;
1.70 } else {
1.71 @@ -2867,7 +2857,7 @@
1.72 // estimate of the number of live bytes.
1.73 void G1CollectorPolicy::
1.74 add_to_collection_set(HeapRegion* hr) {
1.75 - if (G1PrintRegions) {
1.76 + if (G1PrintHeapRegions) {
1.77 gclog_or_tty->print_cr("added region to cset %d:["PTR_FORMAT", "PTR_FORMAT"], "
1.78 "top "PTR_FORMAT", young %s",
1.79 hr->hrs_index(), hr->bottom(), hr->end(),
