<!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>[196259] 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/196259">196259</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 10:58:12 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure that locking code that relies on module boundaries for compiler fences uses NEVER_INLINE
https://bugs.webkit.org/show_bug.cgi?id=153972
Reviewed by Andreas Kling.
When this code was written, we assumed that module boundaries were compiler fences. That might
not be the case if we ever do LTO.
* wtf/Lock.cpp:
(WTF::LockBase::lockSlow):
(WTF::LockBase::unlockSlow):
* wtf/ParkingLot.cpp:
(WTF::ParkingLot::parkConditionally):
(WTF::ParkingLot::unparkOne):
(WTF::ParkingLot::unparkAll):
(WTF::ParkingLot::forEach):
* wtf/WordLock.cpp:
(WTF::WordLock::lockSlow):
(WTF::WordLock::unlockSlow):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfLockcpp">trunk/Source/WTF/wtf/Lock.cpp</a></li>
<li><a href="#trunkSourceWTFwtfParkingLotcpp">trunk/Source/WTF/wtf/ParkingLot.cpp</a></li>
<li><a href="#trunkSourceWTFwtfWordLockcpp">trunk/Source/WTF/wtf/WordLock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (196258 => 196259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-08 18:52:57 UTC (rev 196258)
+++ trunk/Source/WTF/ChangeLog 2016-02-08 18:58:12 UTC (rev 196259)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-02-08 Filip Pizlo <fpizlo@apple.com>
+
+ Make sure that locking code that relies on module boundaries for compiler fences uses NEVER_INLINE
+ https://bugs.webkit.org/show_bug.cgi?id=153972
+
+ Reviewed by Andreas Kling.
+
+ When this code was written, we assumed that module boundaries were compiler fences. That might
+ not be the case if we ever do LTO.
+
+ * wtf/Lock.cpp:
+ (WTF::LockBase::lockSlow):
+ (WTF::LockBase::unlockSlow):
+ * wtf/ParkingLot.cpp:
+ (WTF::ParkingLot::parkConditionally):
+ (WTF::ParkingLot::unparkOne):
+ (WTF::ParkingLot::unparkAll):
+ (WTF::ParkingLot::forEach):
+ * wtf/WordLock.cpp:
+ (WTF::WordLock::lockSlow):
+ (WTF::WordLock::unlockSlow):
+
</ins><span class="cx"> 2016-02-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL] Enable SamplingProfiler
</span></span></pre></div>
<a id="trunkSourceWTFwtfLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Lock.cpp (196258 => 196259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Lock.cpp 2016-02-08 18:52:57 UTC (rev 196258)
+++ trunk/Source/WTF/wtf/Lock.cpp 2016-02-08 18:58:12 UTC (rev 196259)
</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 LockBase::lockSlow()
</del><ins>+NEVER_INLINE 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 LockBase::unlockSlow()
</del><ins>+NEVER_INLINE 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="trunkSourceWTFwtfParkingLotcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParkingLot.cpp (196258 => 196259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParkingLot.cpp 2016-02-08 18:52:57 UTC (rev 196258)
+++ trunk/Source/WTF/wtf/ParkingLot.cpp 2016-02-08 18:58:12 UTC (rev 196259)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx">
</span><span class="cx"> } // anonymous namespace
</span><span class="cx">
</span><del>-bool ParkingLot::parkConditionally(
</del><ins>+NEVER_INLINE bool ParkingLot::parkConditionally(
</ins><span class="cx"> const void* address,
</span><span class="cx"> std::function<bool()> validation,
</span><span class="cx"> std::function<void()> beforeSleep,
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> return !didFind;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ParkingLot::unparkOne(const void* address)
</del><ins>+NEVER_INLINE bool ParkingLot::unparkOne(const void* address)
</ins><span class="cx"> {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog(toString(currentThread(), ": unparking one.\n"));
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParkingLot::unparkOne(
</del><ins>+NEVER_INLINE void ParkingLot::unparkOne(
</ins><span class="cx"> const void* address,
</span><span class="cx"> std::function<void(bool didUnparkThread, bool mayHaveMoreThreads)> callback)
</span><span class="cx"> {
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx"> threadData->parkingCondition.notify_one();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParkingLot::unparkAll(const void* address)
</del><ins>+NEVER_INLINE void ParkingLot::unparkAll(const void* address)
</ins><span class="cx"> {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog(toString(currentThread(), ": unparking all from ", RawPointer(address), ".\n"));
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> dataLog(toString(currentThread(), ": done unparking.\n"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParkingLot::forEach(std::function<void(ThreadIdentifier, const void*)> callback)
</del><ins>+NEVER_INLINE void ParkingLot::forEach(std::function<void(ThreadIdentifier, const void*)> callback)
</ins><span class="cx"> {
</span><span class="cx"> Vector<Bucket*> bucketsToUnlock = lockHashtable();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfWordLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WordLock.cpp (196258 => 196259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WordLock.cpp 2016-02-08 18:52:57 UTC (rev 196258)
+++ trunk/Source/WTF/wtf/WordLock.cpp 2016-02-08 18:58:12 UTC (rev 196259)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> } // anonymous namespace
</span><span class="cx">
</span><del>-void WordLock::lockSlow()
</del><ins>+NEVER_INLINE void WordLock::lockSlow()
</ins><span class="cx"> {
</span><span class="cx"> unsigned spinCount = 0;
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WordLock::unlockSlow()
</del><ins>+NEVER_INLINE void WordLock::unlockSlow()
</ins><span class="cx"> {
</span><span class="cx"> // The fast path can fail either because of spurious weak CAS failure, or because someone put a
</span><span class="cx"> // thread on the queue, or the queue lock is held. If the queue lock is held, it can only be
</span></span></pre>
</div>
</div>
</body>
</html>