<!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>[163685] trunk/Source/JavaScriptCore</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/163685">163685</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 18:52:05 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unify JSLock implementation for iOS and non-iOS ports.
<https://webkit.org/b/128409>
Reviewed by Michael Saboff.
The iOS and non-iOS implementations of dropAllLocks(),
dropAllLocksUnconditionally(), and grabAllLocks() effectively do the
same work. The main difference is that the iOS implementation acquires
the JSLock spin lock in the DropAllLocks class while the other ports
acquire it when it calls JSLock::lock() and unlock().
The other difference is that the iOS implementation will only increment
m_locksDropDepth if it actually drops locks, whereas other ports will
increment it unconditionally. Analogously, iOS decrements the depth only
when needed while other ports will decrement it unconditionally when
re-grabbing locks.
We can unify the 2 implementations by having both use the iOS
implementation for a start.
* runtime/JSLock.cpp:
(JSC::JSLock::dropAllLocks):
(JSC::JSLock::dropAllLocksUnconditionally):
(JSC::JSLock::grabAllLocks):
(JSC::JSLock::DropAllLocks::DropAllLocks):
(JSC::JSLock::DropAllLocks::~DropAllLocks):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163684 => 163685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 02:51:15 UTC (rev 163684)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 02:52:05 UTC (rev 163685)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-07 Mark Lam <mark.lam@apple.com>
+
+ Unify JSLock implementation for iOS and non-iOS ports.
+ <https://webkit.org/b/128409>
+
+ Reviewed by Michael Saboff.
+
+ The iOS and non-iOS implementations of dropAllLocks(),
+ dropAllLocksUnconditionally(), and grabAllLocks() effectively do the
+ same work. The main difference is that the iOS implementation acquires
+ the JSLock spin lock in the DropAllLocks class while the other ports
+ acquire it when it calls JSLock::lock() and unlock().
+
+ The other difference is that the iOS implementation will only increment
+ m_locksDropDepth if it actually drops locks, whereas other ports will
+ increment it unconditionally. Analogously, iOS decrements the depth only
+ when needed while other ports will decrement it unconditionally when
+ re-grabbing locks.
+
+ We can unify the 2 implementations by having both use the iOS
+ implementation for a start.
+
+ * runtime/JSLock.cpp:
+ (JSC::JSLock::dropAllLocks):
+ (JSC::JSLock::dropAllLocksUnconditionally):
+ (JSC::JSLock::grabAllLocks):
+ (JSC::JSLock::DropAllLocks::DropAllLocks):
+ (JSC::JSLock::DropAllLocks::~DropAllLocks):
+
</ins><span class="cx"> 2014-02-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> More FTL build scaffolding
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (163684 => 163685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-08 02:51:15 UTC (rev 163684)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-08 02:52:05 UTC (rev 163685)
</span><span class="lines">@@ -208,7 +208,6 @@
</span><span class="cx"> // This function returns the number of locks that were dropped.
</span><span class="cx"> unsigned JSLock::dropAllLocks(SpinLock& spinLock)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> ASSERT_UNUSED(spinLock, spinLock.IsHeld());
</span><span class="cx"> // Check if this thread is currently holding the lock.
</span><span class="cx"> // FIXME: Maybe we want to require this, guard with an ASSERT?
</span><span class="lines">@@ -231,17 +230,10 @@
</span><span class="cx"> }
</span><span class="cx"> m_lock.unlock();
</span><span class="cx"> return lockCount;
</span><del>-#else
- if (m_lockDropDepth++)
- return 0;
-
- return dropAllLocksUnconditionally(spinLock);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned JSLock::dropAllLocksUnconditionally(SpinLock& spinLock)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> ASSERT_UNUSED(spinLock, spinLock.IsHeld());
</span><span class="cx"> // Check if this thread is currently holding the lock.
</span><span class="cx"> // FIXME: Maybe we want to require this, guard with an ASSERT?
</span><span class="lines">@@ -258,19 +250,10 @@
</span><span class="cx"> }
</span><span class="cx"> m_lock.unlock();
</span><span class="cx"> return lockCount;
</span><del>-#else
- UNUSED_PARAM(spinLock);
- unsigned lockCount = m_lockCount;
- for (unsigned i = 0; i < lockCount; ++i)
- unlock();
-
- return lockCount;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSLock::grabAllLocks(unsigned lockCount, SpinLock& spinLock)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> ASSERT(spinLock.IsHeld());
</span><span class="cx"> // If no locks were dropped, nothing to do!
</span><span class="cx"> if (!lockCount)
</span><span class="lines">@@ -293,13 +276,6 @@
</span><span class="cx"> ASSERT(!m_lockCount);
</span><span class="cx"> m_lockCount = lockCount;
</span><span class="cx"> --m_lockDropDepth;
</span><del>-#else
- UNUSED_PARAM(spinLock);
- for (unsigned i = 0; i < lockCount; ++i)
- lock();
-
- --m_lockDropDepth;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLock::DropAllLocks::DropAllLocks(ExecState* exec, AlwaysDropLocksTag alwaysDropLocks)
</span><span class="lines">@@ -309,9 +285,7 @@
</span><span class="cx"> if (!m_vm)
</span><span class="cx"> return;
</span><span class="cx"> SpinLock& spinLock = m_vm->apiLock().m_spinLock;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SpinLockHolder holder(&spinLock);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx">
</span><span class="lines">@@ -332,9 +306,7 @@
</span><span class="cx"> if (!m_vm)
</span><span class="cx"> return;
</span><span class="cx"> SpinLock& spinLock = m_vm->apiLock().m_spinLock;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SpinLockHolder holder(&spinLock);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx">
</span><span class="lines">@@ -353,9 +325,7 @@
</span><span class="cx"> if (!m_vm)
</span><span class="cx"> return;
</span><span class="cx"> SpinLock& spinLock = m_vm->apiLock().m_spinLock;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SpinLockHolder holder(&spinLock);
</span><del>-#endif
</del><span class="cx"> m_vm->apiLock().grabAllLocks(m_lockCount, spinLock);
</span><span class="cx">
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span></span></pre>
</div>
</div>
</body>
</html>