1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Fri Nov 13 11:55:26 2009 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Nov 19 10:19:19 2009 -0800
1.3 @@ -1528,18 +1528,17 @@
1.4 _recent_prev_end_times_for_all_gcs_sec->dump();
1.5 gclog_or_tty->print_cr("GC = %3.3f, Interval = %3.3f, Ratio = %3.3f",
1.6 _recent_gc_times_ms->sum(), interval_ms, recent_avg_pause_time_ratio());
1.7 - // TEMPORARY: In debug mode, terminate the JVM, so nightly testing explicitly
1.8 - // flags the sighting by failing the test.
1.9 - assert(false, "Debugging data for CR 6898948 has been dumped above");
1.10 -#else // PRODUCT
1.11 - // Clip ratio between 0.0 and 1.0
1.12 + // In debug mode, terminate the JVM if the user wants to debug at this point.
1.13 + assert(!G1FailOnFPError, "Debugging data for CR 6898948 has been dumped above");
1.14 +#endif // !PRODUCT
1.15 + // Clip ratio between 0.0 and 1.0, and continue. This will be fixed in
1.16 + // CR 6902692 by redoing the manner in which the ratio is incrementally computed.
1.17 if (_recent_avg_pause_time_ratio < 0.0) {
1.18 _recent_avg_pause_time_ratio = 0.0;
1.19 } else {
1.20 assert(_recent_avg_pause_time_ratio - 1.0 > 0.0, "Ctl-point invariant");
1.21 _recent_avg_pause_time_ratio = 1.0;
1.22 }
1.23 -#endif // PRODUCT
1.24 }
1.25 }
1.26
