JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / heap / IncrementalSweeper.cpp

diff --git a/heap/IncrementalSweeper.cpp b/heap/IncrementalSweeper.cpp
index 038432a5dee5475d3d96635e3e41edf2c80cb236..e0783d615f5325484fbe9526819556b46e97e0ff 100644 (file)
--- a/heap/IncrementalSweeper.cpp
+++ b/heap/IncrementalSweeper.cpp
@@ -26,37 +26,29 @@
 #include "config.h"
 #include "IncrementalSweeper.h"
 
 #include "config.h"
 #include "IncrementalSweeper.h"
 

-#include "APIShims.h"

 #include "Heap.h"
 #include "JSObject.h"
 #include "JSString.h"
 #include "MarkedBlock.h"
 #include "Heap.h"
 #include "JSObject.h"
 #include "JSString.h"
 #include "MarkedBlock.h"

+#include "JSCInlines.h"

 
 #include <wtf/HashSet.h>
 #include <wtf/WTFThreadData.h>
 
 namespace JSC {
 
 
 #include <wtf/HashSet.h>
 #include <wtf/WTFThreadData.h>
 
 namespace JSC {
 

-#if USE(CF) || PLATFORM(BLACKBERRY) || PLATFORM(QT)
+#if USE(CF)

 
 static const double sweepTimeSlice = .01; // seconds
 static const double sweepTimeTotal = .10;
 static const double sweepTimeMultiplier = 1.0 / sweepTimeTotal;
 
 
 static const double sweepTimeSlice = .01; // seconds
 static const double sweepTimeTotal = .10;
 static const double sweepTimeMultiplier = 1.0 / sweepTimeTotal;
 

-#if USE(CF)
-    

 IncrementalSweeper::IncrementalSweeper(Heap* heap, CFRunLoopRef runLoop)
     : HeapTimer(heap->vm(), runLoop)
 IncrementalSweeper::IncrementalSweeper(Heap* heap, CFRunLoopRef runLoop)
     : HeapTimer(heap->vm(), runLoop)

-    , m_currentBlockToSweepIndex(0)

     , m_blocksToSweep(heap->m_blockSnapshot)
 {
 }
 
     , m_blocksToSweep(heap->m_blockSnapshot)
 {
 }
 

-PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
-{
-    return adoptPtr(new IncrementalSweeper(heap, CFRunLoopGetCurrent()));
-}
-

 void IncrementalSweeper::scheduleTimer()
 {
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + (sweepTimeSlice * sweepTimeMultiplier));
 void IncrementalSweeper::scheduleTimer()
 {
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + (sweepTimeSlice * sweepTimeMultiplier));


@@ -67,36 +59,6 @@ void IncrementalSweeper::cancelTimer()
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
 }
 
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
 }
 

-#elif PLATFORM(BLACKBERRY) || PLATFORM(QT)
-   
-IncrementalSweeper::IncrementalSweeper(Heap* heap)
-    : HeapTimer(heap->vm())
-    , m_currentBlockToSweepIndex(0)
-    , m_blocksToSweep(heap->m_blockSnapshot)
-{
-}
-
-PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
-{
-    return adoptPtr(new IncrementalSweeper(heap));
-}
-
-void IncrementalSweeper::scheduleTimer()
-{
-#if PLATFORM(QT)
-    m_timer.start(sweepTimeSlice * sweepTimeMultiplier * 1000, this);
-#else
-    m_timer.start(sweepTimeSlice * sweepTimeMultiplier);
-#endif
-}
-
-void IncrementalSweeper::cancelTimer()
-{
-    m_timer.stop();
-}
-
-#endif
-

 void IncrementalSweeper::doWork()
 {
     doSweep(WTF::monotonicallyIncreasingTime());
 void IncrementalSweeper::doWork()
 {
     doSweep(WTF::monotonicallyIncreasingTime());


@@ -104,9 +66,7 @@ void IncrementalSweeper::doWork()
 
 void IncrementalSweeper::doSweep(double sweepBeginTime)
 {
 
 void IncrementalSweeper::doSweep(double sweepBeginTime)
 {

-    while (m_currentBlockToSweepIndex < m_blocksToSweep.size()) {
-        sweepNextBlock();
-
+    while (sweepNextBlock()) {

         double elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
         if (elapsedTime < sweepTimeSlice)
             continue;
         double elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
         if (elapsedTime < sweepTimeSlice)
             continue;


@@ -119,30 +79,30 @@ void IncrementalSweeper::doSweep(double sweepBeginTime)
     cancelTimer();
 }
 
     cancelTimer();
 }
 

-void IncrementalSweeper::sweepNextBlock()
+bool IncrementalSweeper::sweepNextBlock()

 {
 {

-    while (m_currentBlockToSweepIndex < m_blocksToSweep.size()) {
-        MarkedBlock* block = m_blocksToSweep[m_currentBlockToSweepIndex++];
+    while (!m_blocksToSweep.isEmpty()) {
+        MarkedBlock* block = m_blocksToSweep.takeLast();

 
         if (!block->needsSweeping())
             continue;
 
 
         if (!block->needsSweeping())
             continue;
 

+        DeferGCForAWhile deferGC(m_vm->heap);

         block->sweep();
         m_vm->heap.objectSpace().freeOrShrinkBlock(block);
         block->sweep();
         m_vm->heap.objectSpace().freeOrShrinkBlock(block);

-        return;
+        return true;

     }
     }

+
+    return m_vm->heap.sweepNextLogicallyEmptyWeakBlock();

 }
 
 }
 

-void IncrementalSweeper::startSweeping(Vector<MarkedBlock*>& blockSnapshot)
+void IncrementalSweeper::startSweeping()

 {
 {

-    m_blocksToSweep = blockSnapshot;
-    m_currentBlockToSweepIndex = 0;

     scheduleTimer();
 }
 
 void IncrementalSweeper::willFinishSweeping()
 {
     scheduleTimer();
 }
 
 void IncrementalSweeper::willFinishSweeping()
 {

-    m_currentBlockToSweepIndex = 0;

     m_blocksToSweep.clear();
     if (m_vm)
         cancelTimer();
     m_blocksToSweep.clear();
     if (m_vm)
         cancelTimer();


@@ -159,12 +119,7 @@ void IncrementalSweeper::doWork()
 {
 }
 
 {
 }
 

-PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
-{
-    return adoptPtr(new IncrementalSweeper(heap->vm()));
-}
-
-void IncrementalSweeper::startSweeping(Vector<MarkedBlock*>&)
+void IncrementalSweeper::startSweeping()

 {
 }
 
 {
 }
 


@@ -172,8 +127,9 @@ void IncrementalSweeper::willFinishSweeping()
 {
 }
 
 {
 }
 

-void IncrementalSweeper::sweepNextBlock()
+bool IncrementalSweeper::sweepNextBlock()

 {
 {

+    return false;

 }
 
 #endif
 }
 
 #endif