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

comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25

author	Gilles Duboscq <gilles.m.duboscq@oracle.com>
date	Tue, 07 Apr 2015 14:58:49 +0200
parents	52b4284cb496 b840813adfcc
children

comparison

equal deleted inserted replaced

-:84105dcdb05b
+:7848fc12602b
 if (adaptive_young_list_length()) {
 _young_list_fixed_length = 0;
 } else {
 _young_list_fixed_length = _young_gen_sizer->min_desired_young_length();
 }
-_free_regions_at_end_of_collection = _g1->free_regions();
+_free_regions_at_end_of_collection = _g1->num_free_regions();
 update_young_list_target_length();
 // We may immediately start allocating regions and placing them on the
 // collection set list. Initialize the per-collection set info
 start_incremental_cset_building();
 _short_lived_surv_rate_group->start_adding_regions();
 // also call this on any additional surv rate groups
 record_survivor_regions(0, NULL, NULL);
-_free_regions_at_end_of_collection = _g1->free_regions();
+_free_regions_at_end_of_collection = _g1->num_free_regions();
 // Reset survivors SurvRateGroup.
 _survivor_surv_rate_group->reset();
 update_young_list_target_length();
 _collectionSetChooser->clear();
 }
 }
 }
 bool new_in_marking_window = _in_marking_window;
 bool new_in_marking_window_im = false;
-if (during_initial_mark_pause()) {
+if (last_pause_included_initial_mark) {
 new_in_marking_window = true;
 new_in_marking_window_im = true;
 }
 if (_last_young_gc) {
 _rs_lengths_seq->add((double) _max_rs_lengths);
 }
 _in_marking_window = new_in_marking_window;
 _in_marking_window_im = new_in_marking_window_im;
-_free_regions_at_end_of_collection = _g1->free_regions();
+_free_regions_at_end_of_collection = _g1->num_free_regions();
 update_young_list_target_length();
 // Note that _mmu_tracker->max_gc_time() returns the time in seconds.
 double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
 adjust_concurrent_refinement(phase_times()->average_last_update_rs_time(),
 YoungList* young_list = _g1->young_list();
 _eden_used_bytes_before_gc = young_list->eden_used_bytes();
 _survivor_used_bytes_before_gc = young_list->survivor_used_bytes();
 _heap_capacity_bytes_before_gc = _g1->capacity();
 _heap_used_bytes_before_gc = _g1->used();
-_cur_collection_pause_used_regions_at_start = _g1->used_regions();
+_cur_collection_pause_used_regions_at_start = _g1->num_used_regions();
 _eden_capacity_bytes_before_gc =
 (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_used_bytes_before_gc;
 if (full) {
 void G1CollectorPolicy::print_yg_surv_rate_info() const {
 #ifndef PRODUCT
 _short_lived_surv_rate_group->print_surv_rate_summary();
 // add this call for any other surv rate groups
 #endif // PRODUCT
+}
+bool G1CollectorPolicy::is_young_list_full() {
+uint young_list_length = _g1->young_list()->length();
+uint young_list_target_length = _young_list_target_length;
+return young_list_length >= young_list_target_length;
+}
+bool G1CollectorPolicy::can_expand_young_list() {
+uint young_list_length = _g1->young_list()->length();
+uint young_list_max_length = _young_list_max_length;
+return young_list_length < young_list_max_length;
 }
 uint G1CollectorPolicy::max_regions(int purpose) {
 switch (purpose) {
 case GCAllocForSurvived:
 void
 G1CollectorPolicy::record_concurrent_mark_cleanup_end(int no_of_gc_threads) {
 _collectionSetChooser->clear();
-uint region_num = _g1->n_regions();
+uint region_num = _g1->num_regions();
 if (G1CollectedHeap::use_parallel_gc_threads()) {
 const uint OverpartitionFactor = 4;
 uint WorkUnit;
 // The use of MinChunkSize = 8 in the original code
 // causes some assertion failures when the total number of
 const uint MinWorkUnit = MAX2(region_num / (uint) ParallelGCThreads, 1U);
 WorkUnit =
 MAX2(region_num / (uint) (ParallelGCThreads * OverpartitionFactor),
 MinWorkUnit);
 }
-_collectionSetChooser->prepare_for_par_region_addition(_g1->n_regions(),
+_collectionSetChooser->prepare_for_par_region_addition(_g1->num_regions(),
 WorkUnit);
 ParKnownGarbageTask parKnownGarbageTask(_collectionSetChooser,
 (int) WorkUnit);
 _g1->workers()->run_task(&parKnownGarbageTask);
 }
 // Add the heap region at the head of the non-incremental collection set
 void G1CollectorPolicy::add_old_region_to_cset(HeapRegion* hr) {
 assert(_inc_cset_build_state == Active, "Precondition");
-assert(!hr->is_young(), "non-incremental add of young region");
+assert(hr->is_old(), "the region should be old");
 assert(!hr->in_collection_set(), "should not already be in the CSet");
 hr->set_in_collection_set(true);
 hr->set_next_in_collection_set(_collection_set);
 _collection_set = hr;
 }
 // Add the region at the RHS of the incremental cset
 void G1CollectorPolicy::add_region_to_incremental_cset_rhs(HeapRegion* hr) {
 // We should only ever be appending survivors at the end of a pause
-assert( hr->is_survivor(), "Logic");
+assert(hr->is_survivor(), "Logic");
 // Do the 'common' stuff
 add_region_to_incremental_cset_common(hr);
 // Now add the region at the right hand side
 }
 // Add the region to the LHS of the incremental cset
 void G1CollectorPolicy::add_region_to_incremental_cset_lhs(HeapRegion* hr) {
 // Survivors should be added to the RHS at the end of a pause
-assert(!hr->is_survivor(), "Logic");
+assert(hr->is_eden(), "Logic");
 // Do the 'common' stuff
 add_region_to_incremental_cset_common(hr);
 // Add the region at the left hand side
 // as a percentage of the heap size. I.e., it should bound the
 // number of old regions added to the CSet irrespective of how many
 // of them are available.
 G1CollectedHeap* g1h = G1CollectedHeap::heap();
-const size_t region_num = g1h->n_regions();
+const size_t region_num = g1h->num_regions();
 const size_t perc = (size_t) G1OldCSetRegionThresholdPercent;
 size_t result = region_num * perc / 100;
 // emulate ceiling
 if (100 * result < region_num * perc) {
 result += 1;
 init_cset_region_lengths(eden_region_length, survivor_region_length);
 HeapRegion* hr = young_list->first_survivor_region();
 while (hr != NULL) {
 assert(hr->is_survivor(), "badly formed young list");
-hr->set_young();
+// There is a convention that all the young regions in the CSet
+// are tagged as "eden", so we do this for the survivors here. We
+// use the special set_eden_pre_gc() as it doesn't check that the
+// region is free (which is not the case here).
+hr->set_eden_pre_gc();
 hr = hr->get_next_young_region();
 }
 // Clear the fields that point to the survivor list - they are all young now.
 young_list->clear_survivors();

Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @ 20804:7848fc12602b