comparison src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp @ 2172:a672e43650cc

7013718: G1: small fixes for two assert/guarantee failures Summary: Two small fixes to deal with a guarantee failure (the marking thread should join the SuspendibleThreadSet before calling a method that does pause prediction work so that said method is never called during a pause) and an assert failure (an assert is too strong). Reviewed-by: iveresov, johnc
author tonyp
date Fri, 21 Jan 2011 11:30:22 -0500
parents 0fa27f37d4d4
children b7a938236e43
comparison
equal deleted inserted replaced
2153:377371490991 2172:a672e43650cc
249 gclog_or_tty->print_cr("[GC concurrent-cleanup-start]"); 249 gclog_or_tty->print_cr("[GC concurrent-cleanup-start]");
250 } 250 }
251 251
252 // Now do the remainder of the cleanup operation. 252 // Now do the remainder of the cleanup operation.
253 _cm->completeCleanup(); 253 _cm->completeCleanup();
254 _sts.join();
254 g1_policy->record_concurrent_mark_cleanup_completed(); 255 g1_policy->record_concurrent_mark_cleanup_completed();
256 _sts.leave();
255 257
256 double cleanup_end_sec = os::elapsedTime(); 258 double cleanup_end_sec = os::elapsedTime();
257 if (PrintGC) { 259 if (PrintGC) {
258 gclog_or_tty->date_stamp(PrintGCDateStamps); 260 gclog_or_tty->date_stamp(PrintGCDateStamps);
259 gclog_or_tty->stamp(PrintGCTimeStamps); 261 gclog_or_tty->stamp(PrintGCTimeStamps);