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

Timestamp:

Jul 30, 2012, 6:48:18 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r124123.
​http://trac.webkit.org/changeset/124123
​https://bugs.webkit.org/show_bug.cgi?id=92700

ASSERT crashes terminate webkit Layout tests (Requested by
msaboff on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-07-30

• heap/Heap.cpp:
• heap/Heap.h:

(Heap):

• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::doSweep):
(JSC::IncrementalSweeper::startSweeping):
(JSC::IncrementalSweeper::IncrementalSweeper):
(JSC):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::tryAllocateHelper):
(JSC::MarkedAllocator::addBlock):

• heap/MarkedAllocator.h:

(JSC::MarkedAllocator::zapFreeList):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::sweepHelper):

• heap/MarkedSpace.cpp:
• heap/MarkedSpace.h:

(JSC::MarkedSpace::sweep):
(JSC):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::~JSGlobalData):

File:

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

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

@@ -70 +70 @@
 }
 
-bool IncrementalSweeper::structuresCanBeSwept()
-{
-    ASSERT(m_currentBlockToSweepIndex <= m_blocksToSweep.size());
-    return !m_blocksToSweep.size() || m_currentBlockToSweepIndex >= m_blocksToSweep.size();
-}
-
 void IncrementalSweeper::doSweep(double sweepBeginTime)
 {
     while (m_currentBlockToSweepIndex < m_blocksToSweep.size()) {
-        MarkedBlock* block = m_blocksToSweep[m_currentBlockToSweepIndex];
-        if (block->onlyContainsStructures()) {
-            m_currentBlockToSweepIndex++;
-            continue;
-        }
-
-        m_blocksToSweep[m_currentBlockToSweepIndex++] = 0;
-
-        if (!block->needsSweeping())
-            continue;
-
-        block->sweep();
-        m_globalData->heap.objectSpace().freeOrShrinkBlock(block);
-
-        CFTimeInterval elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
-        if (elapsedTime < sweepTimeSlice)
-            continue;
-
-        scheduleTimer();
-        return;
-    }
-
-    while (m_currentStructureBlockToSweepIndex < m_blocksToSweep.size()) {
-        MarkedBlock* block = m_blocksToSweep[m_currentStructureBlockToSweepIndex];
-        if (!block) {
-            m_currentStructureBlockToSweepIndex++;
-            continue;
-        }
-
-        m_blocksToSweep[m_currentStructureBlockToSweepIndex++] = 0;
-
+        MarkedBlock* block = m_blocksToSweep[m_currentBlockToSweepIndex++];
         if (!block->needsSweeping())
             continue;
@@ -132 +96 @@
     WTF::copyToVector(blockSnapshot, m_blocksToSweep);
     m_currentBlockToSweepIndex = 0;
-    m_currentStructureBlockToSweepIndex = 0;
     scheduleTimer();
-}
-
-void IncrementalSweeper::willFinishSweeping()
-{
-    m_currentBlockToSweepIndex = m_currentStructureBlockToSweepIndex = 0;
-    m_blocksToSweep.clear();
-    if (m_globalData)
-        cancelTimer();
 }
 
@@ -148 +103 @@
 IncrementalSweeper::IncrementalSweeper(JSGlobalData* globalData)
     : HeapTimer(globalData)
-    , m_structuresCanBeSwept(false)
 {
 }
@@ -161 +115 @@
 }
 
-bool IncrementalSweeper::structuresCanBeSwept()
-{
-    return m_structuresCanBeSwept;
-}
-
 void IncrementalSweeper::startSweeping(const HashSet<MarkedBlock*>&)
 {
-    m_structuresCanBeSwept = false;
 }
-
-void IncrementalSweeper::willFinishSweeping()
-{
-    m_structuresCanBeSwept = true;
-}
-
+    
 #endif