<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208417] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208417">208417</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-11-05 01:24:19 -0700 (Sat, 05 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSCOnly] RunLoopGeneric should adopt MonotonicTime / WallTime change
https://bugs.webkit.org/show_bug.cgi?id=164447
Reviewed by Csaba Osztrogonác.
Build fix for JSCOnly.
* wtf/generic/RunLoopGeneric.cpp:
(WTF::RunLoop::TimerBase::ScheduledTask::create):
(WTF::RunLoop::TimerBase::ScheduledTask::ScheduledTask):
(WTF::RunLoop::TimerBase::ScheduledTask::scheduledTimePoint):
(WTF::RunLoop::TimerBase::ScheduledTask::updateReadyTime):
(WTF::RunLoop::populateTasks):
(WTF::RunLoop::dispatchAfter):
(WTF::RunLoop::TimerBase::start):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfgenericRunLoopGenericcpp">trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208416 => 208417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-05 07:56:49 UTC (rev 208416)
+++ trunk/Source/WTF/ChangeLog 2016-11-05 08:24:19 UTC (rev 208417)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-05 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSCOnly] RunLoopGeneric should adopt MonotonicTime / WallTime change
+ https://bugs.webkit.org/show_bug.cgi?id=164447
+
+ Reviewed by Csaba Osztrogonác.
+
+ Build fix for JSCOnly.
+
+ * wtf/generic/RunLoopGeneric.cpp:
+ (WTF::RunLoop::TimerBase::ScheduledTask::create):
+ (WTF::RunLoop::TimerBase::ScheduledTask::ScheduledTask):
+ (WTF::RunLoop::TimerBase::ScheduledTask::scheduledTimePoint):
+ (WTF::RunLoop::TimerBase::ScheduledTask::updateReadyTime):
+ (WTF::RunLoop::populateTasks):
+ (WTF::RunLoop::dispatchAfter):
+ (WTF::RunLoop::TimerBase::start):
+
</ins><span class="cx"> 2016-11-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> WTF::ParkingLot should stop using std::chrono because std::chrono::duration casts are prone to overflows
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericRunLoopGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp (208416 => 208417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-11-05 07:56:49 UTC (rev 208416)
+++ trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-11-05 08:24:19 UTC (rev 208417)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx"> class RunLoop::TimerBase::ScheduledTask : public ThreadSafeRefCounted<ScheduledTask> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ScheduledTask);
</span><span class="cx"> public:
</span><del>- static RefPtr<ScheduledTask> create(Function<void ()>&& function, double interval, bool repeating)
</del><ins>+ static RefPtr<ScheduledTask> create(Function<void()>&& function, Seconds interval, bool repeating)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new ScheduledTask(WTFMove(function), interval, repeating));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ScheduledTask(Function<void ()>&& function, double interval, bool repeating)
</del><ins>+ ScheduledTask(Function<void()>&& function, Seconds interval, bool repeating)
</ins><span class="cx"> : m_function(WTFMove(function))
</span><del>- , m_fireInterval(std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(interval)))
</del><ins>+ , m_fireInterval(interval)
</ins><span class="cx"> , m_isRepeating(repeating)
</span><span class="cx"> {
</span><span class="cx"> updateReadyTime();
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> return isActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Condition::Clock::time_point scheduledTimePoint() const
</del><ins>+ MonotonicTime scheduledTimePoint() const
</ins><span class="cx"> {
</span><span class="cx"> return m_scheduledTimePoint;
</span><span class="cx"> }
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> void updateReadyTime()
</span><span class="cx"> {
</span><del>- m_scheduledTimePoint = Condition::Clock::now();
- if (!m_fireInterval.count())
</del><ins>+ m_scheduledTimePoint = MonotonicTime::now();
+ if (!m_fireInterval)
</ins><span class="cx"> return;
</span><span class="cx"> m_scheduledTimePoint += m_fireInterval;
</span><span class="cx"> }
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Function<void ()> m_function;
</span><del>- Condition::Clock::time_point m_scheduledTimePoint;
- std::chrono::microseconds m_fireInterval;
</del><ins>+ MonotonicTime m_scheduledTimePoint;
+ Seconds m_fireInterval;
</ins><span class="cx"> std::atomic<bool> m_isActive { true };
</span><span class="cx"> bool m_isRepeating;
</span><span class="cx"> };
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> LockHolder locker(m_loopLock);
</span><span class="cx">
</span><span class="cx"> if (runMode == RunMode::Drain) {
</span><del>- Condition::Clock::time_point sleepUntil = Condition::Clock::time_point::max();
</del><ins>+ MonotonicTime sleepUntil = MonotonicTime::infinity();
</ins><span class="cx"> if (!m_schedules.isEmpty())
</span><span class="cx"> sleepUntil = m_schedules.first()->scheduledTimePoint();
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> statusOfThisLoop = Status::Stopping;
</span><span class="cx">
</span><span class="cx"> // Check expired timers.
</span><del>- Condition::Clock::time_point now = Condition::Clock::now();
</del><ins>+ MonotonicTime now = MonotonicTime::now();
</ins><span class="cx"> while (!m_schedules.isEmpty()) {
</span><span class="cx"> RefPtr<TimerBase::ScheduledTask> earliest = m_schedules.first();
</span><span class="cx"> if (earliest->scheduledTimePoint() > now)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_loopLock);
</span><span class="cx"> bool repeating = false;
</span><del>- schedule(locker, TimerBase::ScheduledTask::create(WTFMove(function), delay.count() / 1000.0 / 1000.0 / 1000.0, repeating));
</del><ins>+ schedule(locker, TimerBase::ScheduledTask::create(WTFMove(function), Seconds(delay.count() / 1000.0 / 1000.0 / 1000.0), repeating));
</ins><span class="cx"> wakeUp(locker);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> stop();
</span><span class="cx"> m_scheduledTask = ScheduledTask::create([this] {
</span><span class="cx"> fired();
</span><del>- }, interval, repeating);
</del><ins>+ }, Seconds(interval), repeating);
</ins><span class="cx"> m_runLoop.scheduleAndWakeUp(m_scheduledTask);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>