Changeset 124352 in webkit for trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

Timestamp:

Aug 1, 2012, 11:55:03 AM (13 years ago)

Author:

[email protected]

Message:

MarkedBlock::sweep() should sweep another block if it can't sweep a Structure block
​https://bugs.webkit.org/show_bug.cgi?id=92819

Reviewed by Geoffrey Garen.

If we are forced to allocate a new block for Structures because we are unable to safely
sweep our pre-existing Structure blocks, we should sweep another random block so that we
can start sweeping Structure blocks sooner.

• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::doSweep): Change to use sweepNextBlock.
(JSC):
(JSC::IncrementalSweeper::sweepNextBlock):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::tryAllocateHelper): When we can't safely sweep
our Structure blocks, call sweepNextBlock instead.

File:

• trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

@@ -74 +74 @@
 {
     while (m_currentBlockToSweepIndex < m_blocksToSweep.size()) {
+        sweepNextBlock();
+
+        CFTimeInterval elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
+        if (elapsedTime < sweepTimeSlice)
+            continue;
+
+        scheduleTimer();
+        return;
+    }
+
+    m_blocksToSweep.clear();
+    cancelTimer();
+}
+
+void IncrementalSweeper::sweepNextBlock()
+{
+    while (m_currentBlockToSweepIndex < m_blocksToSweep.size()) {
         MarkedBlock* block = m_blocksToSweep[m_currentBlockToSweepIndex++];
         if (block->onlyContainsStructures())
@@ -85 +102 @@
         block->sweep();
         m_globalData->heap.objectSpace().freeOrShrinkBlock(block);
-
-        CFTimeInterval elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
-        if (elapsedTime < sweepTimeSlice)
-            continue;
-
-        scheduleTimer();
         return;
     }
-
-    m_blocksToSweep.clear();
-    cancelTimer();
 }
 
@@ -144 +152 @@
 }
 
+void IncrementalSweeper::sweepNextBlock()
+{
+}
+
 #endif