1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Tue Feb 16 14:11:44 2010 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Tue Feb 23 23:13:23 2010 -0500
1.3 @@ -583,7 +583,7 @@
1.4 res->zero_fill_state() == HeapRegion::Allocated)),
1.5 "Non-young alloc Regions must be zero filled (and non-H)");
1.6
1.7 - if (G1PrintRegions) {
1.8 + if (G1PrintHeapRegions) {
1.9 if (res != NULL) {
1.10 gclog_or_tty->print_cr("new alloc region %d:["PTR_FORMAT", "PTR_FORMAT"], "
1.11 "top "PTR_FORMAT,
1.12 @@ -2477,7 +2477,7 @@
1.13 if (G1SummarizeRSetStats) {
1.14 g1_rem_set()->print_summary_info();
1.15 }
1.16 - if (G1SummarizeConcurrentMark) {
1.17 + if (G1SummarizeConcMark) {
1.18 concurrent_mark()->print_summary_info();
1.19 }
1.20 if (G1SummarizeZFStats) {
1.21 @@ -3480,7 +3480,7 @@
1.22 HeapRegion* r = heap_region_containing(old);
1.23 if (!r->evacuation_failed()) {
1.24 r->set_evacuation_failed(true);
1.25 - if (G1PrintRegions) {
1.26 + if (G1PrintHeapRegions) {
1.27 gclog_or_tty->print("evacuation failed in heap region "PTR_FORMAT" "
1.28 "["PTR_FORMAT","PTR_FORMAT")\n",
1.29 r, r->bottom(), r->end());
1.30 @@ -4002,9 +4002,7 @@
1.31 _g1h->g1_policy()->record_obj_copy_time(i, elapsed_ms-term_ms);
1.32 _g1h->g1_policy()->record_termination_time(i, term_ms);
1.33 }
1.34 - if (G1UseSurvivorSpaces) {
1.35 - _g1h->g1_policy()->record_thread_age_table(pss.age_table());
1.36 - }
1.37 + _g1h->g1_policy()->record_thread_age_table(pss.age_table());
1.38 _g1h->update_surviving_young_words(pss.surviving_young_words()+1);
1.39
1.40 // Clean up any par-expanded rem sets.
