Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp	Thu Jan 20 13:57:12 2011 -0800
+++ b/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp	Fri Jan 21 11:30:22 2011 -0500
@@ -251,7 +251,9 @@
 
         // Now do the remainder of the cleanup operation.
         _cm->completeCleanup();
+        _sts.join();
         g1_policy->record_concurrent_mark_cleanup_completed();
+        _sts.leave();
 
         double cleanup_end_sec = os::elapsedTime();
         if (PrintGC) {