jdk8-mips64-public/hotspot: comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp

-:f95d63e2154a
+:631f79e71e90
 if (_alloc_rate_ms_seq->num() > 3) {
 double now_sec = os::elapsedTime();
 double when_ms = _mmu_tracker->when_max_gc_sec(now_sec) * 1000.0;
 double alloc_rate_ms = predict_alloc_rate_ms();
-int min_regions = (int) ceil(alloc_rate_ms * when_ms);
+size_t min_regions = (size_t) ceil(alloc_rate_ms * when_ms);
-int current_region_num = (int) _g1->young_list()->length();
+size_t current_region_num = _g1->young_list()->length();
 _young_list_min_length = min_regions + current_region_num;
 }
 }
 void G1CollectorPolicy::calculate_young_list_target_length() {
 } else {
 if (full_young_gcs())
 _young_list_target_length = _young_list_fixed_length;
 else
 _young_list_target_length = _young_list_fixed_length / 2;
+}
-_young_list_target_length = MAX2(_young_list_target_length, (size_t)1);
-}
+// Make sure we allow the application to allocate at least one
+// region before we need to do a collection again.
+size_t min_length = _g1->young_list()->length() + 1;
+_young_list_target_length = MAX2(_young_list_target_length, min_length);
 calculate_survivors_policy();
 }
 void G1CollectorPolicy::calculate_young_list_target_length(size_t rs_lengths) {
 guarantee( adaptive_young_list_length(), "pre-condition" );
 }
 // and we're done!
 // we should have at least one region in the target young length
 _young_list_target_length =
-MAX2((size_t) 1, final_young_length + _recorded_survivor_regions);
+final_young_length + _recorded_survivor_regions;
 // let's keep an eye of how long we spend on this calculation
 // right now, I assume that we'll print it when we need it; we
 // should really adde it to the breakdown of a pause
 double end_time_sec = os::elapsedTime();
 // leave this in for debugging, just in case
 gclog_or_tty->print_cr("(partial) setting target to " SIZE_FORMAT
 _young_list_min_length);
 #endif // TRACE_CALC_YOUNG_LENGTH
 // we'll do the pause as soon as possible by choosing the minimum
-_young_list_target_length =
+_young_list_target_length = _young_list_min_length;
-MAX2(_young_list_min_length, (size_t) 1);
 }
 _rs_lengths_prediction = rs_lengths;
 }
 _free_regions_at_end_of_collection = _g1->free_regions();
 // Reset survivors SurvRateGroup.
 _survivor_surv_rate_group->reset();
 calculate_young_list_min_length();
 calculate_young_list_target_length();
 }
 void G1CollectorPolicy::record_before_bytes(size_t bytes) {
 _bytes_in_to_space_before_gc += bytes;
 }
 gclog_or_tty->print("[GC pause");
 if (in_young_gc_mode())
 gclog_or_tty->print(" (%s)", full_young_gcs() ? "young" : "partial");
 }
-assert(_g1->used_regions() == _g1->recalculate_used_regions(),
+assert(_g1->used() == _g1->recalculate_used(),
-"sanity");
+err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
-assert(_g1->used() == _g1->recalculate_used(), "sanity");
+_g1->used(), _g1->recalculate_used()));
 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
 _all_stop_world_times_ms->add(s_w_t_ms);
 _stop_world_start = 0.0;
 _short_lived_surv_rate_group->print_surv_rate_summary();
 // add this call for any other surv rate groups
 #endif // PRODUCT
 }
-bool
+void
-G1CollectorPolicy::should_add_next_region_to_young_list() {
+G1CollectorPolicy::update_region_num(bool young) {
-assert(in_young_gc_mode(), "should be in young GC mode");
+if (young) {
-bool ret;
-size_t young_list_length = _g1->young_list()->length();
-size_t young_list_max_length = _young_list_target_length;
-if (G1FixedEdenSize) {
-young_list_max_length -= _max_survivor_regions;
-}
-if (young_list_length < young_list_max_length) {
-ret = true;
 ++_region_num_young;
 } else {
-ret = false;
 ++_region_num_tenured;
 }
-return ret;
 }
 #ifndef PRODUCT
 // for debugging, bit of a hack...
 static char*
 _tenuring_threshold = MaxTenuringThreshold;
 } else {
 _tenuring_threshold = _survivors_age_table.compute_tenuring_threshold(
 HeapRegion::GrainWords * _max_survivor_regions);
 }
-}
-bool
-G1CollectorPolicy_BestRegionsFirst::should_do_collection_pause(size_t
-word_size) {
-assert(_g1->regions_accounted_for(), "Region leakage!");
-double max_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
-size_t young_list_length = _g1->young_list()->length();
-size_t young_list_max_length = _young_list_target_length;
-if (G1FixedEdenSize) {
-young_list_max_length -= _max_survivor_regions;
-}
-bool reached_target_length = young_list_length >= young_list_max_length;
-if (in_young_gc_mode()) {
-if (reached_target_length) {
-assert( young_list_length > 0 && _g1->young_list()->length() > 0,
-"invariant" );
-return true;
-}
-} else {
-guarantee( false, "should not reach here" );
-}
-return false;
 }
 #ifndef PRODUCT
 class HRSortIndexIsOKClosure: public HeapRegionClosure {
 CollectionSetChooser* _chooser;

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp

src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp