Changeset 120742 in webkit for trunk/Source/JavaScriptCore/runtime/GCActivityCallback.h

Timestamp:

Jun 19, 2012, 12:17:31 PM (13 years ago)

Author:

[email protected]

Message:

GCActivityCallback and IncrementalSweeper should share code
​https://bugs.webkit.org/show_bug.cgi?id=89400

Reviewed by Geoffrey Garen.

A lot of functionality is duplicated between GCActivityCallback and IncrementalSweeper.
We should extract the common functionality out into a separate class that both of them
can inherit from. This refactoring will be an even greater boon when we add the ability
to shut these two agents down in a thread-safe fashion

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• heap/Heap.cpp:

(JSC::Heap::Heap): Move initialization down so that the JSGlobalData has a valid Heap when
we're initializing the GCActivityCallback and the IncrementalSweeper.

• heap/Heap.h:

(Heap):

• heap/HeapTimer.cpp: Added.

(JSC):
(JSC::HeapTimer::HeapTimer): Initialize the various base class data that
DefaultGCActivityCallback::commonConstructor() used to do.
(JSC::HeapTimer::~HeapTimer): Call to invalidate().
(JSC::HeapTimer::synchronize): Same functionality as the old DefaultGCActivityCallback::synchronize().
Virtual so that non-CF subclasses can override.
(JSC::HeapTimer::invalidate): Tears down the runloop timer to prevent any future firing.
(JSC::HeapTimer::timerDidFire): Callback to pass to the timer function. Casts and calls the virtual doWork().

• heap/HeapTimer.h: Added. This is the class that serves as the common base class for

both GCActivityCallback and IncrementalSweeper. It handles setting up and tearing down run loops and synchronizing
across threads for its subclasses.
(JSC):
(HeapTimer):

• heap/IncrementalSweeper.cpp: Changes to accomodate the extraction of common functionality

between IncrementalSweeper and GCActivityCallback into a common ancestor.
(JSC):
(JSC::IncrementalSweeper::doWork):
(JSC::IncrementalSweeper::IncrementalSweeper):
(JSC::IncrementalSweeper::cancelTimer):
(JSC::IncrementalSweeper::create):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

• runtime/GCActivityCallback.cpp:

(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::doWork):

• runtime/GCActivityCallback.h:

(GCActivityCallback):
(JSC::GCActivityCallback::willCollect):
(JSC::GCActivityCallback::GCActivityCallback):
(JSC):
(DefaultGCActivityCallback): Remove the platform data struct. The platform data should be kept in
the class itself so as to be accessible by doWork(). Most of the platform data for CF is kept in
HeapTimer anyways, so we only need the m_delay field now.

• runtime/GCActivityCallbackBlackBerry.cpp:

(JSC):
(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::doWork):
(JSC::DefaultGCActivityCallback::didAllocate):

• runtime/GCActivityCallbackCF.cpp:

(JSC):
(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::doWork):
(JSC::DefaultGCActivityCallback::scheduleTimer):
(JSC::DefaultGCActivityCallback::cancelTimer):
(JSC::DefaultGCActivityCallback::didAllocate):
(JSC::DefaultGCActivityCallback::willCollect):
(JSC::DefaultGCActivityCallback::cancel):

File:

• trunk/Source/JavaScriptCore/runtime/GCActivityCallback.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/GCActivityCallback.h

@@ -30 +30 @@
 #define GCActivityCallback_h
 
+#include "HeapTimer.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -41 +42 @@
 class Heap;
 
-class GCActivityCallback {
+class GCActivityCallback : public HeapTimer {
 public:
-    virtual ~GCActivityCallback() { }
     virtual void didAllocate(size_t) { }
     virtual void willCollect() { }
-    virtual void synchronize() { }
     virtual void cancel() { }
     bool isEnabled() const { return m_enabled; }
@@ -52 +51 @@
 
 protected:
-    GCActivityCallback()
-        : m_enabled(true)
+#if USE(CF)
+    GCActivityCallback(JSGlobalData* globalData, CFRunLoopRef runLoop)
+        : HeapTimer(globalData, runLoop)
+        , m_enabled(true)
     {
     }
+# else
+    GCActivityCallback(JSGlobalData* globalData)
+        : HeapTimer(globalData)
+        , m_enabled(true)
+    {
+    }
+#endif
 
     bool m_enabled;
 };
-
-struct DefaultGCActivityCallbackPlatformData;
 
 class DefaultGCActivityCallback : public GCActivityCallback {
@@ -67 +73 @@
 
     DefaultGCActivityCallback(Heap*);
-    virtual ~DefaultGCActivityCallback();
 
     virtual void didAllocate(size_t);
     virtual void willCollect();
-    virtual void synchronize();
     virtual void cancel();
+    
+    virtual void doWork();
 
 #if USE(CF)
 protected:
     DefaultGCActivityCallback(Heap*, CFRunLoopRef);
-    void commonConstructor(Heap*, CFRunLoopRef);
+    
+    void cancelTimer();
+    void scheduleTimer(double);
+    
+private:
+    double m_delay;
 #endif
-
-private:
-    OwnPtr<DefaultGCActivityCallbackPlatformData> d;
 };