Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 4710:41406797186b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7113012: G1: rename not-fully-young GCs as "mixed" Summary: Renamed partially-young GCs as mixed and fully-young GCs as young. Change all external output that includes those terms (GC log and GC ergo log) as well as any comments, fields, methods, etc. The changeset also includes very minor code tidying up (added some curly brackets). Reviewed-by: johnc, brutisso
author tonyp
date Fri, 16 Dec 2011 02:14:27 -0500
parents fd2b426c30db
children adedfbbf0360
comparison
equal deleted inserted replaced
4709:fd2b426c30db 4710:41406797186b
1292 abandon_collection_set(g1_policy()->inc_cset_head()); 1292 abandon_collection_set(g1_policy()->inc_cset_head());
1293 g1_policy()->clear_incremental_cset(); 1293 g1_policy()->clear_incremental_cset();
1294 g1_policy()->stop_incremental_cset_building(); 1294 g1_policy()->stop_incremental_cset_building();
1295 1295
1296 tear_down_region_sets(false /* free_list_only */); 1296 tear_down_region_sets(false /* free_list_only */);
1297 g1_policy()->set_full_young_gcs(true); 1297 g1_policy()->set_gcs_are_young(true);
1298 1298
1299 // See the comments in g1CollectedHeap.hpp and 1299 // See the comments in g1CollectedHeap.hpp and
1300 // G1CollectedHeap::ref_processing_init() about 1300 // G1CollectedHeap::ref_processing_init() about
1301 // how reference processing currently works in G1. 1301 // how reference processing currently works in G1.
1302 1302
3524 // This call will decide whether this pause is an initial-mark 3524 // This call will decide whether this pause is an initial-mark
3525 // pause. If it is, during_initial_mark_pause() will return true 3525 // pause. If it is, during_initial_mark_pause() will return true
3526 // for the duration of this pause. 3526 // for the duration of this pause.
3527 g1_policy()->decide_on_conc_mark_initiation(); 3527 g1_policy()->decide_on_conc_mark_initiation();
3528 3528
3529 // We do not allow initial-mark to be piggy-backed on a 3529 // We do not allow initial-mark to be piggy-backed on a mixed GC.
3530 // partially-young GC.
3531 assert(!g1_policy()->during_initial_mark_pause() || 3530 assert(!g1_policy()->during_initial_mark_pause() ||
3532 g1_policy()->full_young_gcs(), "sanity"); 3531 g1_policy()->gcs_are_young(), "sanity");
3533 3532
3534 // We also do not allow partially-young GCs during marking. 3533 // We also do not allow mixed GCs during marking.
3535 assert(!mark_in_progress() || g1_policy()->full_young_gcs(), "sanity"); 3534 assert(!mark_in_progress() || g1_policy()->gcs_are_young(), "sanity");
3536 3535
3537 char verbose_str[128]; 3536 char verbose_str[128];
3538 sprintf(verbose_str, "GC pause "); 3537 sprintf(verbose_str, "GC pause ");
3539 if (g1_policy()->full_young_gcs()) { 3538 if (g1_policy()->gcs_are_young()) {
3540 strcat(verbose_str, "(young)"); 3539 strcat(verbose_str, "(young)");
3541 } else { 3540 } else {
3542 strcat(verbose_str, "(partial)"); 3541 strcat(verbose_str, "(mixed)");
3543 } 3542 }
3544 if (g1_policy()->during_initial_mark_pause()) { 3543 if (g1_policy()->during_initial_mark_pause()) {
3545 strcat(verbose_str, " (initial-mark)"); 3544 strcat(verbose_str, " (initial-mark)");
3546 // We are about to start a marking cycle, so we increment the 3545 // We are about to start a marking cycle, so we increment the
3547 // full collection counter. 3546 // full collection counter.