<!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>[163730] 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/163730">163730</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 16:46:17 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename a field and some variables in JSLock to better describe what they contain.
<https://webkit.org/b/128475>
Reviewed by Oliver Hunt.
* runtime/JSLock.cpp:
(JSC::JSLock::dropAllLocks):
(JSC::JSLock::dropAllLocksUnconditionally):
(JSC::JSLock::grabAllLocks):
(JSC::JSLock::DropAllLocks::DropAllLocks):
(JSC::JSLock::DropAllLocks::~DropAllLocks):
* runtime/JSLock.h:</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>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockh">trunk/Source/JavaScriptCore/runtime/JSLock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163729 => 163730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-09 00:01:16 UTC (rev 163729)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-09 00:46:17 UTC (rev 163730)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-08 Mark Lam <mark.lam@apple.com>
+
+ Rename a field and some variables in JSLock to better describe what they contain.
+ <https://webkit.org/b/128475>
+
+ Reviewed by Oliver Hunt.
+
+ * runtime/JSLock.cpp:
+ (JSC::JSLock::dropAllLocks):
+ (JSC::JSLock::dropAllLocksUnconditionally):
+ (JSC::JSLock::grabAllLocks):
+ (JSC::JSLock::DropAllLocks::DropAllLocks):
+ (JSC::JSLock::DropAllLocks::~DropAllLocks):
+ * runtime/JSLock.h:
+
</ins><span class="cx"> 2014-02-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using getCharactersWithUpconvert in JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (163729 => 163730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-09 00:01:16 UTC (rev 163729)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-09 00:46:17 UTC (rev 163730)
</span><span class="lines">@@ -211,8 +211,8 @@
</span><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><del>- unsigned lockCount = m_lockCount;
- if (!lockCount || m_ownerThread != WTF::currentThread())
</del><ins>+ unsigned locksToDrop = m_lockCount;
+ if (!locksToDrop || m_ownerThread != WTF::currentThread())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // Don't drop the locks if they've already been dropped once.
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> m_vm->updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
</span><span class="cx"> }
</span><span class="cx"> m_lock.unlock();
</span><del>- return lockCount;
</del><ins>+ return locksToDrop;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned JSLock::dropAllLocksUnconditionally(SpinLock& spinLock)
</span><span class="lines">@@ -242,8 +242,8 @@
</span><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><del>- unsigned lockCount = m_lockCount;
- if (!lockCount || m_ownerThread != WTF::currentThread())
</del><ins>+ unsigned locksToDrop = m_lockCount;
+ if (!locksToDrop || m_ownerThread != WTF::currentThread())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="lines">@@ -259,21 +259,21 @@
</span><span class="cx"> m_vm->updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
</span><span class="cx"> }
</span><span class="cx"> m_lock.unlock();
</span><del>- return lockCount;
</del><ins>+ return locksToDrop;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSLock::grabAllLocks(unsigned lockCount, SpinLock& spinLock)
</del><ins>+void JSLock::grabAllLocks(unsigned droppedLockCount, SpinLock& spinLock)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(spinLock.IsHeld());
</span><span class="cx"> // If no locks were dropped, nothing to do!
</span><del>- if (!lockCount)
</del><ins>+ if (!droppedLockCount)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ThreadIdentifier currentThread = WTF::currentThread();
</span><span class="cx"> // Check if this thread is currently holding the lock.
</span><span class="cx"> // FIXME: Maybe we want to prohibit this, guard against with an ASSERT?
</span><span class="cx"> if (m_ownerThread == currentThread && m_lockCount) {
</span><del>- m_lockCount += lockCount;
</del><ins>+ m_lockCount += droppedLockCount;
</ins><span class="cx"> --m_lockDropDepth;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx">
</span><span class="cx"> m_ownerThread = currentThread;
</span><span class="cx"> ASSERT(!m_lockCount);
</span><del>- m_lockCount = lockCount;
</del><ins>+ m_lockCount = droppedLockCount;
</ins><span class="cx"> --m_lockDropDepth;
</span><span class="cx">
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLock::DropAllLocks::DropAllLocks(ExecState* exec, AlwaysDropLocksTag alwaysDropLocks)
</span><del>- : m_lockCount(0)
</del><ins>+ : m_droppedLockCount(0)
</ins><span class="cx"> , m_vm(exec ? &exec->vm() : nullptr)
</span><span class="cx"> {
</span><span class="cx"> if (!m_vm)
</span><span class="lines">@@ -303,13 +303,13 @@
</span><span class="cx"> SpinLockHolder holder(&spinLock);
</span><span class="cx">
</span><span class="cx"> if (alwaysDropLocks)
</span><del>- m_lockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
</del><ins>+ m_droppedLockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
</ins><span class="cx"> else
</span><del>- m_lockCount = m_vm->apiLock().dropAllLocks(spinLock);
</del><ins>+ m_droppedLockCount = m_vm->apiLock().dropAllLocks(spinLock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLock::DropAllLocks::DropAllLocks(VM* vm, AlwaysDropLocksTag alwaysDropLocks)
</span><del>- : m_lockCount(0)
</del><ins>+ : m_droppedLockCount(0)
</ins><span class="cx"> , m_vm(vm)
</span><span class="cx"> {
</span><span class="cx"> if (!m_vm)
</span><span class="lines">@@ -318,9 +318,9 @@
</span><span class="cx"> SpinLockHolder holder(&spinLock);
</span><span class="cx">
</span><span class="cx"> if (alwaysDropLocks)
</span><del>- m_lockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
</del><ins>+ m_droppedLockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
</ins><span class="cx"> else
</span><del>- m_lockCount = m_vm->apiLock().dropAllLocks(spinLock);
</del><ins>+ m_droppedLockCount = m_vm->apiLock().dropAllLocks(spinLock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLock::DropAllLocks::~DropAllLocks()
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> return;
</span><span class="cx"> SpinLock& spinLock = m_vm->apiLock().m_spinLock;
</span><span class="cx"> SpinLockHolder holder(&spinLock);
</span><del>- m_vm->apiLock().grabAllLocks(m_lockCount, spinLock);
</del><ins>+ m_vm->apiLock().grabAllLocks(m_droppedLockCount, spinLock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.h (163729 => 163730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.h 2014-02-09 00:01:16 UTC (rev 163729)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.h 2014-02-09 00:46:17 UTC (rev 163730)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE ~DropAllLocks();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- intptr_t m_lockCount;
</del><ins>+ intptr_t m_droppedLockCount;
</ins><span class="cx"> RefPtr<VM> m_vm;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>