comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 4875:379b22e03c32

Merge
author jcoomes
date Fri, 03 Feb 2012 12:08:55 -0800
parents eff609af17d7 aa3d708d67c4
children caa4652b4414
comparison
equal deleted inserted replaced
4866:527cf36f4a20 4875:379b22e03c32
1236 } 1236 }
1237 1237
1238 SvcGCMarker sgcm(SvcGCMarker::FULL); 1238 SvcGCMarker sgcm(SvcGCMarker::FULL);
1239 ResourceMark rm; 1239 ResourceMark rm;
1240 1240
1241 if (PrintHeapAtGC) { 1241 print_heap_before_gc();
1242 Universe::print_heap_before_gc();
1243 }
1244 1242
1245 HRSPhaseSetter x(HRSPhaseFullGC); 1243 HRSPhaseSetter x(HRSPhaseFullGC);
1246 verify_region_sets_optional(); 1244 verify_region_sets_optional();
1247 1245
1248 const bool do_clear_all_soft_refs = clear_all_soft_refs || 1246 const bool do_clear_all_soft_refs = clear_all_soft_refs ||
1490 increment_full_collections_completed(false /* concurrent */); 1488 increment_full_collections_completed(false /* concurrent */);
1491 1489
1492 _hrs.verify_optional(); 1490 _hrs.verify_optional();
1493 verify_region_sets_optional(); 1491 verify_region_sets_optional();
1494 1492
1495 if (PrintHeapAtGC) { 1493 print_heap_after_gc();
1496 Universe::print_heap_after_gc();
1497 }
1498 g1mm()->update_sizes(); 1494 g1mm()->update_sizes();
1499 post_full_gc_dump(); 1495 post_full_gc_dump();
1500 1496
1501 return true; 1497 return true;
1502 } 1498 }
3558 } 3554 }
3559 3555
3560 SvcGCMarker sgcm(SvcGCMarker::MINOR); 3556 SvcGCMarker sgcm(SvcGCMarker::MINOR);
3561 ResourceMark rm; 3557 ResourceMark rm;
3562 3558
3563 if (PrintHeapAtGC) { 3559 print_heap_before_gc();
3564 Universe::print_heap_before_gc();
3565 }
3566 3560
3567 HRSPhaseSetter x(HRSPhaseEvacuation); 3561 HRSPhaseSetter x(HRSPhaseEvacuation);
3568 verify_region_sets_optional(); 3562 verify_region_sets_optional();
3569 verify_dirty_young_regions(); 3563 verify_dirty_young_regions();
3570 3564
3935 verify_region_sets_optional(); 3929 verify_region_sets_optional();
3936 3930
3937 TASKQUEUE_STATS_ONLY(if (ParallelGCVerbose) print_taskqueue_stats()); 3931 TASKQUEUE_STATS_ONLY(if (ParallelGCVerbose) print_taskqueue_stats());
3938 TASKQUEUE_STATS_ONLY(reset_taskqueue_stats()); 3932 TASKQUEUE_STATS_ONLY(reset_taskqueue_stats());
3939 3933
3940 if (PrintHeapAtGC) { 3934 print_heap_after_gc();
3941 Universe::print_heap_after_gc();
3942 }
3943 g1mm()->update_sizes(); 3935 g1mm()->update_sizes();
3944 3936
3945 if (G1SummarizeRSetStats && 3937 if (G1SummarizeRSetStats &&
3946 (G1SummarizeRSetStatsPeriod > 0) && 3938 (G1SummarizeRSetStatsPeriod > 0) &&
3947 (total_collections() % G1SummarizeRSetStatsPeriod == 0)) { 3939 (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {