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

Timestamp:

Apr 11, 2017, 2:34:36 AM (8 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Enable JSRunLoopTimer for JSCOnly and Windows
​https://bugs.webkit.org/show_bug.cgi?id=170655

Reviewed by Carlos Garcia Campos.

Source/JavaScriptCore:

• runtime/JSRunLoopTimer.cpp:

(JSC::JSRunLoopTimer::JSRunLoopTimer):
(JSC::JSRunLoopTimer::scheduleTimer):
(JSC::JSRunLoopTimer::cancelTimer):

• runtime/JSRunLoopTimer.h:

Source/WTF:

This patch makes RunLoop::Timer in Generic and Windows thread-safe to use it
in JSC's JSRunLoopTimer. Eventually, we would like to replace JSRunLoopTimer's
platform-dependent implementation to WTF::RunLoop::Timer.

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

(WTF::RunLoop::TimerBase::start):

• wtf/generic/RunLoopGeneric.cpp:

(WTF::RunLoop::TimerBase::ScheduledTask::EarliestSchedule::operator()):
(WTF::RunLoop::populateTasks):
(WTF::RunLoop::runImpl):
(WTF::RunLoop::schedule):
(WTF::RunLoop::scheduleAndWakeUp):
(WTF::RunLoop::TimerBase::~TimerBase):
(WTF::RunLoop::TimerBase::start):
(WTF::RunLoop::TimerBase::stop):
(WTF::RunLoop::TimerBase::isActive):

• wtf/glib/RunLoopGLib.cpp:

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

• wtf/win/RunLoopWin.cpp:

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

File:

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

trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp

@@ -162 +162 @@
     m_isScheduled = false;
 }
+
 #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.startOneShot(s_decade);
 }
 
@@ -172 +179 @@
 }
 
-void JSRunLoopTimer::scheduleTimer(double)
+void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
 {
+    m_timer.startOneShot(intervalInSeconds);
+    m_isScheduled = true;
 }
 
 void JSRunLoopTimer::cancelTimer()
 {
+    m_timer.startOneShot(s_decade);
+    m_isScheduled = false;
 }
+
 #endif
-    
+
 } // namespace JSC