comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 63a4eb8bcd23
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
316 _collectionSetChooser = new CollectionSetChooser(); 316 _collectionSetChooser = new CollectionSetChooser();
317 } 317 }
318 318
319 void G1CollectorPolicy::initialize_alignments() { 319 void G1CollectorPolicy::initialize_alignments() {
320 _space_alignment = HeapRegion::GrainBytes; 320 _space_alignment = HeapRegion::GrainBytes;
321 size_t card_table_alignment = GenRemSet::max_alignment_constraint(); 321 size_t card_table_alignment = GenRemSet::max_alignment_constraint(GenRemSet::CardTable);
322 size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size(); 322 size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
323 _heap_alignment = MAX3(card_table_alignment, _space_alignment, page_size); 323 _heap_alignment = MAX3(card_table_alignment, _space_alignment, page_size);
324 } 324 }
325 325
326 void G1CollectorPolicy::initialize_flags() { 326 void G1CollectorPolicy::initialize_flags() {
1073 set_gcs_are_young(true); 1073 set_gcs_are_young(true);
1074 } 1074 }
1075 } 1075 }
1076 1076
1077 _short_lived_surv_rate_group->start_adding_regions(); 1077 _short_lived_surv_rate_group->start_adding_regions();
1078 // Do that for any other surv rate groups 1078 // do that for any other surv rate groupsx
1079 1079
1080 if (update_stats) { 1080 if (update_stats) {
1081 double cost_per_card_ms = 0.0; 1081 double cost_per_card_ms = 0.0;
1082 if (_pending_cards > 0) { 1082 if (_pending_cards > 0) {
1083 cost_per_card_ms = phase_times()->average_last_update_rs_time() / (double) _pending_cards; 1083 cost_per_card_ms = phase_times()->average_last_update_rs_time() / (double) _pending_cards;
1739 size_t used_bytes = hr->used(); 1739 size_t used_bytes = hr->used();
1740 _inc_cset_recorded_rs_lengths += rs_length; 1740 _inc_cset_recorded_rs_lengths += rs_length;
1741 _inc_cset_predicted_elapsed_time_ms += region_elapsed_time_ms; 1741 _inc_cset_predicted_elapsed_time_ms += region_elapsed_time_ms;
1742 _inc_cset_bytes_used_before += used_bytes; 1742 _inc_cset_bytes_used_before += used_bytes;
1743 1743
1744 // Cache the values we have added to the aggregated information 1744 // Cache the values we have added to the aggregated informtion
1745 // in the heap region in case we have to remove this region from 1745 // in the heap region in case we have to remove this region from
1746 // the incremental collection set, or it is updated by the 1746 // the incremental collection set, or it is updated by the
1747 // rset sampling code 1747 // rset sampling code
1748 hr->set_recorded_rs_length(rs_length); 1748 hr->set_recorded_rs_length(rs_length);
1749 hr->set_predicted_elapsed_time_ms(region_elapsed_time_ms); 1749 hr->set_predicted_elapsed_time_ms(region_elapsed_time_ms);