<!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>[188722] trunk/Source</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/188722">188722</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-20 17:47:16 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/188717">r188717</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/188719">r188719</a>.
https://bugs.webkit.org/show_bug.cgi?id=148272
Broke the Mavericks build (Requested by andersca on #webkit).
Reverted changesets:
"Merge Lock and LockBase"
https://bugs.webkit.org/show_bug.cgi?id=148266
http://trac.webkit.org/changeset/188717
"Merge ConditionBase and Condition"
https://bugs.webkit.org/show_bug.cgi?id=148270
http://trac.webkit.org/changeset/188719</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAtomicsh">trunk/Source/WTF/wtf/Atomics.h</a></li>
<li><a href="#trunkSourceWTFwtfConditionh">trunk/Source/WTF/wtf/Condition.h</a></li>
<li><a href="#trunkSourceWTFwtfLockcpp">trunk/Source/WTF/wtf/Lock.cpp</a></li>
<li><a href="#trunkSourceWTFwtfLockh">trunk/Source/WTF/wtf/Lock.h</a></li>
<li><a href="#trunkSourceWTFwtfWordLockh">trunk/Source/WTF/wtf/WordLock.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfLoaderRunLoopCFcpp">trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/ChangeLog 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-20 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r188717 and r188719.
+ https://bugs.webkit.org/show_bug.cgi?id=148272
+
+ Broke the Mavericks build (Requested by andersca on #webkit).
+
+ Reverted changesets:
+
+ "Merge Lock and LockBase"
+ https://bugs.webkit.org/show_bug.cgi?id=148266
+ http://trac.webkit.org/changeset/188717
+
+ "Merge ConditionBase and Condition"
+ https://bugs.webkit.org/show_bug.cgi?id=148270
+ http://trac.webkit.org/changeset/188719
+
</ins><span class="cx"> 2015-08-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge ConditionBase and Condition
</span></span></pre></div>
<a id="trunkSourceWTFwtfAtomicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Atomics.h (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Atomics.h 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/wtf/Atomics.h 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -81,12 +81,6 @@
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> struct Atomic {
</span><del>- Atomic() = default;
- CONSTEXPR Atomic(T value)
- : value(value)
- {
- }
-
</del><span class="cx"> // Don't pass a non-default value for the order parameter unless you really know
</span><span class="cx"> // what you are doing and have thought about it very hard. The cost of seq_cst
</span><span class="cx"> // is usually not high enough to justify the risk.
</span></span></pre></div>
<a id="trunkSourceWTFwtfConditionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Condition.h (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Condition.h 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/wtf/Condition.h 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -43,7 +43,9 @@
</span><span class="cx"> // case where no thread is waiting. This condition variable, when used with WTF::Lock, can
</span><span class="cx"> // outperform a system condition variable and lock by up to 58x.
</span><span class="cx">
</span><del>-struct Condition {
</del><ins>+// This is a struct without a constructor or destructor so that it can be statically initialized.
+// Use Lock in instance variables.
+struct ConditionBase {
</ins><span class="cx"> typedef ParkingLot::Clock Clock;
</span><span class="cx">
</span><span class="cx"> // Wait on a parking queue while releasing the given lock. It will unlock the lock just before
</span><span class="lines">@@ -226,12 +228,24 @@
</span><span class="cx"> return Clock::now() + myRelativeTimeout;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Atomic<bool> m_hasWaiters { false };
</del><ins>+ Atomic<bool> m_hasWaiters;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+class Condition : public ConditionBase {
+ WTF_MAKE_NONCOPYABLE(Condition);
+public:
+ Condition()
+ {
+ m_hasWaiters.store(false);
+ }
+};
+
+typedef ConditionBase StaticCondition;
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::Condition;
</span><ins>+using WTF::StaticCondition;
</ins><span class="cx">
</span><span class="cx"> #endif // WTF_Condition_h
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Lock.cpp (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Lock.cpp 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/wtf/Lock.cpp 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx">
</span><del>-void Lock::lockSlow()
</del><ins>+void LockBase::lockSlow()
</ins><span class="cx"> {
</span><span class="cx"> unsigned spinCount = 0;
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Lock::unlockSlow()
</del><ins>+void LockBase::unlockSlow()
</ins><span class="cx"> {
</span><span class="cx"> // We could get here because the weak CAS in unlock() failed spuriously, or because there is
</span><span class="cx"> // someone parked. So, we need a CAS loop: even if right now the lock is just held, it could
</span></span></pre></div>
<a id="trunkSourceWTFwtfLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Lock.h (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Lock.h 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/wtf/Lock.h 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -43,7 +43,9 @@
</span><span class="cx"> // cannot be acquired in a short period of time, the thread is put to sleep until the lock is available
</span><span class="cx"> // again). It uses less memory than a std::mutex.
</span><span class="cx">
</span><del>-struct Lock {
</del><ins>+// This is a struct without a constructor or destructor so that it can be statically initialized.
+// Use Lock in instance variables.
+struct LockBase {
</ins><span class="cx"> void lock()
</span><span class="cx"> {
</span><span class="cx"> if (LIKELY(m_byte.compareExchangeWeak(0, isHeldBit, std::memory_order_acquire))) {
</span><span class="lines">@@ -106,13 +108,20 @@
</span><span class="cx"> return !m_byte.load();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Atomic<uint8_t> m_byte { 0 };
</del><ins>+ Atomic<uint8_t> m_byte;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-typedef Locker<Lock> LockHolder;
</del><ins>+class Lock : public LockBase {
+ WTF_MAKE_NONCOPYABLE(Lock);
+public:
+ Lock()
+ {
+ m_byte.store(0, std::memory_order_relaxed);
+ }
+};
</ins><span class="cx">
</span><del>-// FIXME: Once all clients have been moved from StaticLock to Lock we can get rid of this typedef.
-typedef Lock StaticLock;
</del><ins>+typedef LockBase StaticLock;
+typedef Locker<LockBase> LockHolder;
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfWordLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WordLock.h (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WordLock.h 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WTF/wtf/WordLock.h 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -45,7 +45,10 @@
</span><span class="cx"> class WordLock {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WordLock);
</span><span class="cx"> public:
</span><del>- CONSTEXPR WordLock() = default;
</del><ins>+ WordLock()
+ {
+ m_word.store(0, std::memory_order_relaxed);
+ }
</ins><span class="cx">
</span><span class="cx"> void lock()
</span><span class="cx"> {
</span><span class="lines">@@ -93,7 +96,7 @@
</span><span class="cx"> return !m_word.load();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Atomic<uintptr_t> m_word { 0 };
</del><ins>+ Atomic<uintptr_t> m_word;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Locker<WordLock> WordLockHolder;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-20 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r188717 and r188719.
+ https://bugs.webkit.org/show_bug.cgi?id=148272
+
+ Broke the Mavericks build (Requested by andersca on #webkit).
+
+ Reverted changesets:
+
+ "Merge Lock and LockBase"
+ https://bugs.webkit.org/show_bug.cgi?id=148266
+ http://trac.webkit.org/changeset/188717
+
+ "Merge ConditionBase and Condition"
+ https://bugs.webkit.org/show_bug.cgi?id=148270
+ http://trac.webkit.org/changeset/188719
+
</ins><span class="cx"> 2015-08-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge ConditionBase and Condition
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfLoaderRunLoopCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.cpp (188721 => 188722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.cpp 2015-08-21 00:26:46 UTC (rev 188721)
+++ trunk/Source/WebCore/platform/network/cf/LoaderRunLoopCF.cpp 2015-08-21 00:47:16 UTC (rev 188722)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> static CFRunLoopRef loaderRunLoopObject = 0;
</span><span class="cx">
</span><span class="cx"> static StaticLock loaderRunLoopMutex;
</span><del>-static Condition loaderRunLoopConditionVariable;
</del><ins>+static StaticCondition loaderRunLoopConditionVariable;
</ins><span class="cx">
</span><span class="cx"> static void emptyPerform(void*)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>