Changeset 124141 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

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 <​webkit.review.bot@gmail.com> 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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)
• heap/Heap.h (modified) (1 diff)
• heap/IncrementalSweeper.cpp (modified) (4 diffs)
• heap/IncrementalSweeper.h (modified) (2 diffs)
• heap/MarkedAllocator.cpp (modified) (3 diffs)
• heap/MarkedAllocator.h (modified) (1 diff)
• heap/MarkedBlock.cpp (modified) (2 diffs)
• heap/MarkedSpace.cpp (modified) (2 diffs)
• heap/MarkedSpace.h (modified) (1 diff)
• runtime/JSGlobalData.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-07-30  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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).
+
+        * 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):
+
 2012-07-30  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -831 +831 @@
 }
 
-bool Heap::isSafeToSweepStructures()
-{
-    return !m_sweeper || m_sweeper->structuresCanBeSwept();
-}
-
-void Heap::didStartVMShutdown()
-{
-    m_activityCallback->didStartVMShutdown();
-    m_activityCallback = 0;
-    m_sweeper->didStartVMShutdown();
-    m_sweeper = 0;
-    lastChanceToFinalize();
-}
-
 } // namespace JSC

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -169 +169 @@
 
         bool isPagedOut(double deadline);
-        bool isSafeToSweepStructures();
-        void didStartVMShutdown();
 
     private:

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
 

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h

@@ -43 +43 @@
     void startSweeping(const HashSet<MarkedBlock*>& blockSnapshot);
     virtual void doWork();
-    bool structuresCanBeSwept();
-    void willFinishSweeping();
 
 private:
-
 #if USE(CF)
     IncrementalSweeper(Heap*, CFRunLoopRef);
@@ -56 +53 @@
     
     unsigned m_currentBlockToSweepIndex;
-    unsigned m_currentStructureBlockToSweepIndex;
     Vector<MarkedBlock*> m_blocksToSweep;
 #else
     
     IncrementalSweeper(JSGlobalData*);
-   
-    bool m_structuresCanBeSwept;
-
+    
 #endif
 };

trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp

@@ -4 +4 @@
 #include "GCActivityCallback.h"
 #include "Heap.h"
-#include "IncrementalSweeper.h"
 #include "JSGlobalData.h"
 #include <wtf/CurrentTime.h>
@@ -31 +30 @@
 {
     if (!m_freeList.head) {
-        if (m_onlyContainsStructures && !m_heap->isSafeToSweepStructures()) {
-            if (m_currentBlock) {
-                m_currentBlock->didConsumeFreeList();
-                m_currentBlock = 0;
-            }
-            return 0;
-        }
-
         for (MarkedBlock*& block = m_blocksToSweep; block; block = static_cast<MarkedBlock*>(block->next())) {
             m_freeList = block->sweep(MarkedBlock::SweepToFreeList);
@@ -114 +105 @@
 {
     ASSERT(!m_currentBlock);
+    ASSERT(!m_blocksToSweep);
     ASSERT(!m_freeList.head);
     

trunk/Source/JavaScriptCore/heap/MarkedAllocator.h

@@ -102 +102 @@
     
     m_currentBlock->zapFreeList(m_freeList);
-    m_currentBlock = 0;
     m_freeList = MarkedBlock::FreeList();
 }

trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -27 +27 @@
 #include "MarkedBlock.h"
 
-#include "IncrementalSweeper.h"
 #include "JSCell.h"
 #include "JSObject.h"
@@ -142 +141 @@
         return FreeList();
     case Marked:
-        ASSERT(!m_onlyContainsStructures || heap()->isSafeToSweepStructures());
         return sweepMode == SweepToFreeList
             ? specializedSweep<Marked, SweepToFreeList, destructorCallNeeded>()
             : specializedSweep<Marked, SweepOnly, destructorCallNeeded>();
     case Zapped:
-        ASSERT(!m_onlyContainsStructures || heap()->isSafeToSweepStructures());
         return sweepMode == SweepToFreeList
             ? specializedSweep<Zapped, SweepToFreeList, destructorCallNeeded>()

trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp

@@ -22 +22 @@
 #include "MarkedSpace.h"
 
-#include "IncrementalSweeper.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
@@ -108 +107 @@
     canonicalizeCellLivenessData();
     forEachBlock<LastChanceToFinalize>();
-}
-
-void MarkedSpace::sweep()
-{
-    m_heap->sweeper()->willFinishSweeping();
-    forEachBlock<Sweep>();
 }
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.h

@@ -236 +236 @@
 }
 
+inline void MarkedSpace::sweep()
+{
+    forEachBlock<Sweep>();
+}
+
 inline size_t MarkedSpace::objectCount()
 {

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -224 +224 @@
 {
     ASSERT(!m_apiLock.currentThreadIsHoldingLock());
-    heap.didStartVMShutdown();
+    heap.activityCallback()->didStartVMShutdown();
+    heap.sweeper()->didStartVMShutdown();
+    heap.lastChanceToFinalize();
 
     delete interpreter;