<!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>[213896] trunk</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/213896">213896</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-14 06:20:52 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WTF:
Add secondsAs<T> methods to Seconds to convert it to integers with clamp
https://bugs.webkit.org/show_bug.cgi?id=169537
Reviewed by Carlos Garcia Campos.
When using the usual static_cast, infinity becomes 0 accidentally.
It is not intended value when using Seconds for timeout value.
Instead, we use clampToAccepting64 to convert Seconds to
integer values to pass them to the system functions.
* wtf/MathExtras.h:
(clampToAccepting64):
* wtf/Seconds.h:
(WTF::Seconds::minutesAs):
(WTF::Seconds::secondsAs):
(WTF::Seconds::millisecondsAs):
(WTF::Seconds::microsecondsAs):
(WTF::Seconds::nanosecondsAs):
* wtf/cocoa/WorkQueueCocoa.cpp:
(WTF::WorkQueue::dispatchAfter):
* wtf/glib/RunLoopGLib.cpp:
(WTF::RunLoop::dispatchAfter):
(WTF::RunLoop::TimerBase::updateReadyTime):
Tools:
[WTF] Clean up RunLoop and WorkQueue with Seconds and Function
https://bugs.webkit.org/show_bug.cgi?id=169537
Reviewed by Carlos Garcia Campos.
* TestWebKitAPI/Tests/WTF/Time.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfSecondsh">trunk/Source/WTF/wtf/Seconds.h</a></li>
<li><a href="#trunkSourceWTFwtfcocoaWorkQueueCocoacpp">trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibRunLoopGLibcpp">trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFTimecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Source/WTF/ChangeLog 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-03-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Add secondsAs<T> methods to Seconds to convert it to integers with clamp
+ https://bugs.webkit.org/show_bug.cgi?id=169537
+
+ Reviewed by Carlos Garcia Campos.
+
+ When using the usual static_cast, infinity becomes 0 accidentally.
+ It is not intended value when using Seconds for timeout value.
+ Instead, we use clampToAccepting64 to convert Seconds to
+ integer values to pass them to the system functions.
+
+ * wtf/MathExtras.h:
+ (clampToAccepting64):
+ * wtf/Seconds.h:
+ (WTF::Seconds::minutesAs):
+ (WTF::Seconds::secondsAs):
+ (WTF::Seconds::millisecondsAs):
+ (WTF::Seconds::microsecondsAs):
+ (WTF::Seconds::nanosecondsAs):
+ * wtf/cocoa/WorkQueueCocoa.cpp:
+ (WTF::WorkQueue::dispatchAfter):
+ * wtf/glib/RunLoopGLib.cpp:
+ (WTF::RunLoop::dispatchAfter):
+ (WTF::RunLoop::TimerBase::updateReadyTime):
+
</ins><span class="cx"> 2017-03-13 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC][Linux] Implement VMTrap in Linux ports
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Source/WTF/wtf/MathExtras.h 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -193,6 +193,17 @@
</span><span class="cx"> return static_cast<int>(x);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Explicitly accept 64bit result when clamping double value.
+// Keep in mind that double can only represent 53bit integer precisely.
+template<typename T> inline T clampToAccepting64(double value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
+{
+ if (value >= static_cast<double>(max))
+ return max;
+ if (value <= static_cast<double>(min))
+ return min;
+ return static_cast<T>(value);
+}
+
</ins><span class="cx"> inline bool isWithinIntRange(float x)
</span><span class="cx"> {
</span><span class="cx"> return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
</span></span></pre></div>
<a id="trunkSourceWTFwtfSecondsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Seconds.h (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Seconds.h 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Source/WTF/wtf/Seconds.h 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -51,6 +51,13 @@
</span><span class="cx"> double milliseconds() const { return seconds() * 1000; }
</span><span class="cx"> double microseconds() const { return milliseconds() * 1000; }
</span><span class="cx"> double nanoseconds() const { return microseconds() * 1000; }
</span><ins>+
+ // Keep in mind that Seconds is held in double. If the value is not in range of 53bit integer, the result may not be precise.
+ template<typename T> T minutesAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(minutes()); }
+ template<typename T> T secondsAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(seconds()); }
+ template<typename T> T millisecondsAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(milliseconds()); }
+ template<typename T> T microsecondsAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(microseconds()); }
+ template<typename T> T nanosecondsAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(nanoseconds()); }
</ins><span class="cx">
</span><span class="cx"> static constexpr Seconds fromMinutes(double minutes)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaWorkQueueCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkQueue::dispatchAfter(Seconds duration, Function<void()>&& function)
</span><span class="cx"> {
</span><del>- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.nanoseconds()), m_dispatchQueue, BlockPtr<void()>::fromCallable([protectedThis = makeRef(*this), function = WTFMove(function)] {
</del><ins>+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.nanosecondsAs<int64_t>()), m_dispatchQueue, BlockPtr<void()>::fromCallable([protectedThis = makeRef(*this), function = WTFMove(function)] {
</ins><span class="cx"> function();
</span><span class="cx"> }).get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibRunLoopGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> void RunLoop::dispatchAfter(Seconds duration, Function<void()>&& function)
</span><span class="cx"> {
</span><del>- GRefPtr<GSource> source = adoptGRef(g_timeout_source_new(duration.milliseconds()));
</del><ins>+ GRefPtr<GSource> source = adoptGRef(g_timeout_source_new(duration.millisecondsAs<guint>()));
</ins><span class="cx"> g_source_set_name(source.get(), "[WebKit] RunLoop dispatchAfter");
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DispatchAfterContext> context = std::make_unique<DispatchAfterContext>(WTFMove(function));
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gint64 currentTime = g_get_monotonic_time();
</span><del>- gint64 targetTime = currentTime + std::min<gint64>(G_MAXINT64 - currentTime, m_fireInterval.microseconds());
</del><ins>+ gint64 targetTime = currentTime + std::min<gint64>(G_MAXINT64 - currentTime, m_fireInterval.microsecondsAs<gint64>());
</ins><span class="cx"> ASSERT(targetTime >= currentTime);
</span><span class="cx"> g_source_set_ready_time(m_source.get(), targetTime);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Tools/ChangeLog 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Clean up RunLoop and WorkQueue with Seconds and Function
+ https://bugs.webkit.org/show_bug.cgi?id=169537
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/Tests/WTF/Time.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2017-03-13 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView provides no access to cookies.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp (213895 => 213896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp 2017-03-14 09:01:49 UTC (rev 213895)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp 2017-03-14 13:20:52 UTC (rev 213896)
</span><span class="lines">@@ -314,5 +314,44 @@
</span><span class="cx"> EXPECT_TRUE(Seconds::fromNanoseconds(2.5) == 2.5_ns);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_Time, clamp)
+{
+ Seconds positiveInfinity = Seconds::infinity();
+ EXPECT_TRUE(positiveInfinity.secondsAs<int32_t>() == INT32_MAX);
+ EXPECT_TRUE(positiveInfinity.secondsAs<uint32_t>() == UINT32_MAX);
+ EXPECT_TRUE(positiveInfinity.secondsAs<int64_t>() == INT64_MAX);
+ EXPECT_TRUE(positiveInfinity.secondsAs<uint64_t>() == UINT64_MAX);
+ EXPECT_TRUE(positiveInfinity.millisecondsAs<int32_t>() == INT32_MAX);
+ EXPECT_TRUE(positiveInfinity.millisecondsAs<uint32_t>() == UINT32_MAX);
+ EXPECT_TRUE(positiveInfinity.millisecondsAs<int64_t>() == INT64_MAX);
+ EXPECT_TRUE(positiveInfinity.millisecondsAs<uint64_t>() == UINT64_MAX);
+ EXPECT_TRUE(positiveInfinity.microsecondsAs<int32_t>() == INT32_MAX);
+ EXPECT_TRUE(positiveInfinity.microsecondsAs<uint32_t>() == UINT32_MAX);
+ EXPECT_TRUE(positiveInfinity.microsecondsAs<int64_t>() == INT64_MAX);
+ EXPECT_TRUE(positiveInfinity.microsecondsAs<uint64_t>() == UINT64_MAX);
+ EXPECT_TRUE(positiveInfinity.nanosecondsAs<int32_t>() == INT32_MAX);
+ EXPECT_TRUE(positiveInfinity.nanosecondsAs<uint32_t>() == UINT32_MAX);
+ EXPECT_TRUE(positiveInfinity.nanosecondsAs<int64_t>() == INT64_MAX);
+ EXPECT_TRUE(positiveInfinity.nanosecondsAs<uint64_t>() == UINT64_MAX);
+
+ Seconds negativeInfinity = -Seconds::infinity();
+ EXPECT_TRUE(negativeInfinity.secondsAs<int32_t>() == INT32_MIN);
+ EXPECT_TRUE(negativeInfinity.secondsAs<uint32_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.secondsAs<int64_t>() == INT64_MIN);
+ EXPECT_TRUE(negativeInfinity.secondsAs<uint64_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.millisecondsAs<int32_t>() == INT32_MIN);
+ EXPECT_TRUE(negativeInfinity.millisecondsAs<uint32_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.millisecondsAs<int64_t>() == INT64_MIN);
+ EXPECT_TRUE(negativeInfinity.millisecondsAs<uint64_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.microsecondsAs<int32_t>() == INT32_MIN);
+ EXPECT_TRUE(negativeInfinity.microsecondsAs<uint32_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.microsecondsAs<int64_t>() == INT64_MIN);
+ EXPECT_TRUE(negativeInfinity.microsecondsAs<uint64_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.nanosecondsAs<int32_t>() == INT32_MIN);
+ EXPECT_TRUE(negativeInfinity.nanosecondsAs<uint32_t>() == 0);
+ EXPECT_TRUE(negativeInfinity.nanosecondsAs<int64_t>() == INT64_MIN);
+ EXPECT_TRUE(negativeInfinity.nanosecondsAs<uint64_t>() == 0);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>