Changeset 215228 in webkit for trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp

Timestamp:

Apr 11, 2017, 7:56:21 AM (8 years ago)

Author:

Yusuke Suzuki

Message:

[JSC][GTK] Use RunLoop::Timer in GTK port
​https://bugs.webkit.org/show_bug.cgi?id=170723

Reviewed by Carlos Garcia Campos.

Source/JavaScriptCore:

This patch makes GTK port use RunLoop::Timer for JSRunLoopTimer.
Only Cocoa-based ports use platform-specific Timer because it
has additional feature that changes RunLoop to the WebThread one.

And we enable Heap timers in all the ports including JSCOnly port.

• heap/EdenGCActivityCallback.cpp:

(JSC::EdenGCActivityCallback::lastGCLength):

• heap/EdenGCActivityCallback.h:
• heap/FullGCActivityCallback.cpp:

(JSC::FullGCActivityCallback::lastGCLength):

• heap/FullGCActivityCallback.h:
• heap/GCActivityCallback.cpp:

(JSC::GCActivityCallback::GCActivityCallback):
(JSC::GCActivityCallback::doWork):
(JSC::GCActivityCallback::scheduleTimer):
(JSC::GCActivityCallback::cancelTimer):
(JSC::GCActivityCallback::nextFireTime):
(JSC::GCActivityCallback::didAllocate):

• heap/GCActivityCallback.h:
• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::doWork):
(JSC::IncrementalSweeper::doSweep):

• heap/IncrementalSweeper.h:
• heap/StopIfNecessaryTimer.cpp:

(JSC::StopIfNecessaryTimer::scheduleSoon):

• runtime/JSRunLoopTimer.cpp:

(JSC::JSRunLoopTimer::setRunLoop):
(JSC::JSRunLoopTimer::scheduleTimer):
(JSC::JSRunLoopTimer::cancelTimer):
(JSC::JSRunLoopTimer::JSRunLoopTimer):
(JSC::JSRunLoopTimer::~JSRunLoopTimer):
(JSC::JSRunLoopTimer::timerDidFireCallback):

• runtime/JSRunLoopTimer.h:
• runtime/PromiseDeferredTimer.cpp:

(JSC::PromiseDeferredTimer::scheduleWorkSoon):

Source/WTF:

Add secondsUntilFire method. And add setName and setPriority
for GTK RunLoop::Timer.

• wtf/RunLoop.h:
• wtf/cf/RunLoopCF.cpp:

(WTF::RunLoop::TimerBase::secondsUntilFire):

• wtf/generic/RunLoopGeneric.cpp:

(WTF::RunLoop::TimerBase::secondsUntilFire):

• wtf/glib/RunLoopGLib.cpp:

(WTF::RunLoop::TimerBase::setName):
(WTF::RunLoop::TimerBase::secondsUntilFire):

• wtf/win/RunLoopWin.cpp:

(WTF::RunLoop::TimerBase::timerFired):
(WTF::RunLoop::TimerBase::start):
(WTF::RunLoop::TimerBase::isActive):
(WTF::RunLoop::TimerBase::secondsUntilFire):

File:

• trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp

@@ -36 +36 @@
 #include <wtf/Threading.h>
 
-#if USE(GLIB)
+#if USE(GLIB_EVENT_LOOP)
 #include <glib.h>
 #include <wtf/glib/RunLoopSourcePriority.h>
@@ -42 +42 @@
 
 namespace JSC {
+
+const Seconds JSRunLoopTimer::s_decade { 60 * 60 * 24 * 365 * 10 };
 
 void JSRunLoopTimer::timerDidFire()
@@ -64 +66 @@
 #if USE(CF)
 
-const CFTimeInterval JSRunLoopTimer::s_decade = 60 * 60 * 24 * 365 * 10;
-
 JSRunLoopTimer::JSRunLoopTimer(VM* vm)
     : m_vm(vm)
@@ -86 +86 @@
         memset(&m_context, 0, sizeof(CFRunLoopTimerContext));
         m_context.info = this;
-        m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + s_decade, s_decade, 0, 0, JSRunLoopTimer::timerDidFireCallback, &m_context));
+        m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + s_decade.seconds(), s_decade.seconds(), 0, 0, JSRunLoopTimer::timerDidFireCallback, &m_context));
         CFRunLoopAddTimer(m_runLoop.get(), m_timer.get(), kCFRunLoopCommonModes);
     }
@@ -101 +101 @@
 }
 
-void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
+void JSRunLoopTimer::scheduleTimer(Seconds intervalInSeconds)
 {
-    CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + intervalInSeconds);
+    CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + intervalInSeconds.seconds());
     m_isScheduled = true;
 }
@@ -109 +109 @@
 void JSRunLoopTimer::cancelTimer()
 {
-    CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
-    m_isScheduled = false;
-}
-
-#elif USE(GLIB)
-
-const long JSRunLoopTimer::s_decade = 60 * 60 * 24 * 365 * 10;
-
-static GSourceFuncs JSRunLoopTimerSourceFunctions = {
-    nullptr, // prepare
-    nullptr, // check
-    // dispatch
-    [](GSource*, GSourceFunc callback, gpointer userData) -> gboolean
-    {
-        return callback(userData);
-    },
-    nullptr, // finalize
-    nullptr, // closure_callback
-    nullptr, // closure_marshall
-};
-
-JSRunLoopTimer::JSRunLoopTimer(VM* vm)
-    : m_vm(vm)
-    , m_apiLock(&vm->apiLock())
-    , m_timer(adoptGRef(g_source_new(&JSRunLoopTimerSourceFunctions, sizeof(GSource))))
-{
-    g_source_set_priority(m_timer.get(), RunLoopSourcePriority::JavascriptTimer);
-    g_source_set_name(m_timer.get(), "[JavaScriptCore] JSRunLoopTimer");
-    g_source_set_callback(m_timer.get(), [](gpointer userData) -> gboolean {
-        auto& runLoopTimer = *static_cast<JSRunLoopTimer*>(userData);
-        g_source_set_ready_time(runLoopTimer.m_timer.get(), g_get_monotonic_time() + JSRunLoopTimer::s_decade * G_USEC_PER_SEC);
-        runLoopTimer.timerDidFire();
-        return G_SOURCE_CONTINUE;
-    }, this, nullptr);
-    g_source_attach(m_timer.get(), g_main_context_get_thread_default());
-}
-
-JSRunLoopTimer::~JSRunLoopTimer()
-{
-    g_source_destroy(m_timer.get());
-}
-
-void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
-{
-    g_source_set_ready_time(m_timer.get(), g_get_monotonic_time() + intervalInSeconds * G_USEC_PER_SEC);
-    m_isScheduled = true;
-}
-
-void JSRunLoopTimer::cancelTimer()
-{
-    g_source_set_ready_time(m_timer.get(), g_get_monotonic_time() + s_decade * G_USEC_PER_SEC);
+    CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade.seconds());
     m_isScheduled = false;
 }
@@ -165 +115 @@
 #else
 
-const Seconds JSRunLoopTimer::s_decade { 60 * 60 * 24 * 365 * 10 };
-
 JSRunLoopTimer::JSRunLoopTimer(VM* vm)
     : m_vm(vm)
     , m_apiLock(&vm->apiLock())
-    , m_timer(RunLoop::current(), this, &JSRunLoopTimer::timerDidFire)
+    , m_timer(RunLoop::current(), this, &JSRunLoopTimer::timerDidFireCallback)
 {
+#if USE(GLIB_EVENT_LOOP)
+    m_timer.setPriority(RunLoopSourcePriority::JavascriptTimer);
+    m_timer.setName("[JavaScriptCore] JSRunLoopTimer");
+#endif
     m_timer.startOneShot(s_decade);
 }
@@ -179 +131 @@
 }
 
-void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
+void JSRunLoopTimer::timerDidFireCallback()
+{
+    m_timer.startOneShot(s_decade);
+    timerDidFire();
+}
+
+void JSRunLoopTimer::scheduleTimer(Seconds intervalInSeconds)
 {
     m_timer.startOneShot(intervalInSeconds);