Mercurial > hg > truffle

diff src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp @ 142:8bd1e4487c18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Sun, 04 May 2008 03:29:31 -0700
parents ba764ed4b6f2 3febac328d82
children d1605aabd0a1 05712c37c828
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Fri May 02 08:22:11 2008 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Sun May 04 03:29:31 2008 -0700
@@ -976,7 +976,7 @@
   DEBUG_ONLY(mark_bitmap_count = mark_bitmap_size = 0;)
 
   // Increment the invocation count
-  heap->increment_total_collections();
+  heap->increment_total_collections(true);
 
   // We need to track unique mark sweep invocations as well.
   _total_invocations++;
@@ -1941,7 +1941,7 @@
   assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
   assert(ref_processor() != NULL, "Sanity");
 
-  if (GC_locker::is_active()) {
+  if (GC_locker::check_active_before_gc()) {
     return;
   }