1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu May 07 17:09:48 2009 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Mon May 11 16:30:56 2009 -0700
1.3 @@ -167,11 +167,6 @@
1.4
1.5 _all_full_gc_times_ms(new NumberSeq()),
1.6
1.7 - _conc_refine_enabled(0),
1.8 - _conc_refine_zero_traversals(0),
1.9 - _conc_refine_max_traversals(0),
1.10 - _conc_refine_current_delta(G1ConcRefineInitialDelta),
1.11 -
1.12 // G1PausesBtwnConcMark defaults to -1
1.13 // so the hack is to do the cast QQQ FIXME
1.14 _pauses_btwn_concurrent_mark((size_t)G1PausesBtwnConcMark),
1.15 @@ -1634,9 +1629,8 @@
1.16 print_stats(1, "Parallel Time", _cur_collection_par_time_ms);
1.17 print_par_stats(2, "Update RS (Start)", _par_last_update_rs_start_times_ms, false);
1.18 print_par_stats(2, "Update RS", _par_last_update_rs_times_ms);
1.19 - if (G1RSBarrierUseQueue)
1.20 - print_par_buffers(3, "Processed Buffers",
1.21 - _par_last_update_rs_processed_buffers, true);
1.22 + print_par_buffers(3, "Processed Buffers",
1.23 + _par_last_update_rs_processed_buffers, true);
1.24 print_par_stats(2, "Ext Root Scanning", _par_last_ext_root_scan_times_ms);
1.25 print_par_stats(2, "Mark Stack Scanning", _par_last_mark_stack_scan_times_ms);
1.26 print_par_stats(2, "Scan-Only Scanning", _par_last_scan_only_times_ms);
1.27 @@ -1649,9 +1643,8 @@
1.28 print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
1.29 } else {
1.30 print_stats(1, "Update RS", update_rs_time);
1.31 - if (G1RSBarrierUseQueue)
1.32 - print_stats(2, "Processed Buffers",
1.33 - (int)update_rs_processed_buffers);
1.34 + print_stats(2, "Processed Buffers",
1.35 + (int)update_rs_processed_buffers);
1.36 print_stats(1, "Ext Root Scanning", ext_root_scan_time);
1.37 print_stats(1, "Mark Stack Scanning", mark_stack_scan_time);
1.38 print_stats(1, "Scan-Only Scanning", scan_only_time);
1.39 @@ -2467,18 +2460,6 @@
1.40 (double) _region_num_young / (double) all_region_num * 100.0,
1.41 _region_num_tenured,
1.42 (double) _region_num_tenured / (double) all_region_num * 100.0);
1.43 -
1.44 - if (!G1RSBarrierUseQueue) {
1.45 - gclog_or_tty->print_cr("Of %d times conc refinement was enabled, %d (%7.2f%%) "
1.46 - "did zero traversals.",
1.47 - _conc_refine_enabled, _conc_refine_zero_traversals,
1.48 - _conc_refine_enabled > 0 ?
1.49 - 100.0 * (float)_conc_refine_zero_traversals/
1.50 - (float)_conc_refine_enabled : 0.0);
1.51 - gclog_or_tty->print_cr(" Max # of traversals = %d.",
1.52 - _conc_refine_max_traversals);
1.53 - gclog_or_tty->print_cr("");
1.54 - }
1.55 }
1.56 if (TraceGen1Time) {
1.57 if (_all_full_gc_times_ms->num() > 0) {
1.58 @@ -2500,38 +2481,6 @@
1.59 #endif // PRODUCT
1.60 }
1.61
1.62 -void G1CollectorPolicy::update_conc_refine_data() {
1.63 - unsigned traversals = _g1->concurrent_g1_refine()->disable();
1.64 - if (traversals == 0) _conc_refine_zero_traversals++;
1.65 - _conc_refine_max_traversals = MAX2(_conc_refine_max_traversals,
1.66 - (size_t)traversals);
1.67 -
1.68 - if (G1PolicyVerbose > 1)
1.69 - gclog_or_tty->print_cr("Did a CR traversal series: %d traversals.", traversals);
1.70 - double multiplier = 1.0;
1.71 - if (traversals == 0) {
1.72 - multiplier = 4.0;
1.73 - } else if (traversals > (size_t)G1ConcRefineTargTraversals) {
1.74 - multiplier = 1.0/1.5;
1.75 - } else if (traversals < (size_t)G1ConcRefineTargTraversals) {
1.76 - multiplier = 1.5;
1.77 - }
1.78 - if (G1PolicyVerbose > 1) {
1.79 - gclog_or_tty->print_cr(" Multiplier = %7.2f.", multiplier);
1.80 - gclog_or_tty->print(" Delta went from %d regions to ",
1.81 - _conc_refine_current_delta);
1.82 - }
1.83 - _conc_refine_current_delta =
1.84 - MIN2(_g1->n_regions(),
1.85 - (size_t)(_conc_refine_current_delta * multiplier));
1.86 - _conc_refine_current_delta =
1.87 - MAX2(_conc_refine_current_delta, (size_t)1);
1.88 - if (G1PolicyVerbose > 1) {
1.89 - gclog_or_tty->print_cr("%d regions.", _conc_refine_current_delta);
1.90 - }
1.91 - _conc_refine_enabled++;
1.92 -}
1.93 -
1.94 bool
1.95 G1CollectorPolicy::should_add_next_region_to_young_list() {
1.96 assert(in_young_gc_mode(), "should be in young GC mode");
