1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Mon Mar 09 13:34:00 2009 -0700 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Mar 12 18:16:36 2009 -0700 1.3 @@ -1014,7 +1014,7 @@ 1.4 1.5 _all_full_gc_times_ms->add(full_gc_time_ms); 1.6 1.7 - update_recent_gc_times(end_sec, full_gc_time_sec); 1.8 + update_recent_gc_times(end_sec, full_gc_time_ms); 1.9 1.10 _g1->clear_full_collection(); 1.11 1.12 @@ -1475,6 +1475,7 @@ 1.13 size_t cur_used_bytes = _g1->used(); 1.14 assert(cur_used_bytes == _g1->recalculate_used(), "It should!"); 1.15 bool last_pause_included_initial_mark = false; 1.16 + bool update_stats = !abandoned && !_g1->evacuation_failed(); 1.17 1.18 #ifndef PRODUCT 1.19 if (G1YoungSurvRateVerbose) { 1.20 @@ -1535,7 +1536,7 @@ 1.21 1.22 _n_pauses++; 1.23 1.24 - if (!abandoned) { 1.25 + if (update_stats) { 1.26 _recent_CH_strong_roots_times_ms->add(_cur_CH_strong_roots_dur_ms); 1.27 _recent_G1_strong_roots_times_ms->add(_cur_G1_strong_roots_dur_ms); 1.28 _recent_evac_times_ms->add(evac_ms); 1.29 @@ -1636,7 +1637,7 @@ 1.30 double termination_time = avg_value(_par_last_termination_times_ms); 1.31 1.32 double parallel_other_time; 1.33 - if (!abandoned) { 1.34 + if (update_stats) { 1.35 MainBodySummary* body_summary = summary->main_body_summary(); 1.36 guarantee(body_summary != NULL, "should not be null!"); 1.37 1.38 @@ -1852,7 +1853,7 @@ 1.39 1.40 // <NEW PREDICTION> 1.41 1.42 - if (!popular && !abandoned) { 1.43 + if (!popular && update_stats) { 1.44 double pause_time_ms = elapsed_ms; 1.45 1.46 size_t diff = 0;