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

Timestamp:

Aug 30, 2012, 1:50:40 PM (13 years ago)

Author:

[email protected]

Message:

[BlackBerry] Implement IncrementalSweeper for PLATFORM(BLACKBERRY)
​https://bugs.webkit.org/show_bug.cgi?id=95469

Reviewed by Rob Buis.

RIM PR# 200595.
Share most code with USE(CF) and implement timer-related methods
for PLATFORM(BLACKBERRY).

• heap/IncrementalSweeper.cpp:

(JSC):
(JSC::IncrementalSweeper::IncrementalSweeper):
(JSC::IncrementalSweeper::create):
(JSC::IncrementalSweeper::scheduleTimer):
(JSC::IncrementalSweeper::cancelTimer):
(JSC::IncrementalSweeper::doSweep):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

File:

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

trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

@@ -38 +38 @@
 namespace JSC {
 
+#if USE(CF) || PLATFORM(BLACKBERRY)
+
+static const double sweepTimeSlice = .01; // seconds
+static const double sweepTimeTotal = .10;
+static const double sweepTimeMultiplier = 1.0 / sweepTimeTotal;
+
 #if USE(CF)
-
-static const CFTimeInterval sweepTimeSlice = .01; // seconds
-static const CFTimeInterval sweepTimeTotal = .10;
-static const CFTimeInterval sweepTimeMultiplier = 1.0 / sweepTimeTotal;
-
-void IncrementalSweeper::doWork()
-{
-    doSweep(WTF::monotonicallyIncreasingTime());
-}
     
 IncrementalSweeper::IncrementalSweeper(Heap* heap, CFRunLoopRef runLoop)
@@ -71 +68 @@
 }
 
+#elif PLATFORM(BLACKBERRY)
+   
+IncrementalSweeper::IncrementalSweeper(Heap* heap)
+    : HeapTimer(heap->globalData())
+    , m_currentBlockToSweepIndex(0)
+    , m_structuresCanBeSwept(false)
+{
+}
+
+IncrementalSweeper* IncrementalSweeper::create(Heap* heap)
+{
+    return new IncrementalSweeper(heap);
+}
+
+void IncrementalSweeper::scheduleTimer()
+{
+    m_timer.start(sweepTimeSlice * sweepTimeMultiplier);
+}
+
+void IncrementalSweeper::cancelTimer()
+{
+    m_timer.stop();
+}
+
+#endif
+
+void IncrementalSweeper::doWork()
+{
+    doSweep(WTF::monotonicallyIncreasingTime());
+}
+
 void IncrementalSweeper::doSweep(double sweepBeginTime)
 {
@@ -76 +104 @@
         sweepNextBlock();
 
-        CFTimeInterval elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
+        double elapsedTime = WTF::monotonicallyIncreasingTime() - sweepBeginTime;
         if (elapsedTime < sweepTimeSlice)
             continue;