Changeset 163730 in webkit

Timestamp:

Feb 8, 2014 4:46:17 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSLock.cpp (modified) (10 diffs)
• runtime/JSLock.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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:
+
 2014-02-08  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -212 +212 @@
     // Check if this thread is currently holding the lock.
     // FIXME: Maybe we want to require this, guard with an ASSERT?
-    unsigned lockCount = m_lockCount;
-    if (!lockCount || m_ownerThread != WTF::currentThread())
+    unsigned locksToDrop = m_lockCount;
+    if (!locksToDrop || m_ownerThread != WTF::currentThread())
         return 0;
 
@@ -235 +235 @@
     }
     m_lock.unlock();
-    return lockCount;
+    return locksToDrop;
 }
 
@@ -243 +243 @@
     // Check if this thread is currently holding the lock.
     // FIXME: Maybe we want to require this, guard with an ASSERT?
-    unsigned lockCount = m_lockCount;
-    if (!lockCount || m_ownerThread != WTF::currentThread())
+    unsigned locksToDrop = m_lockCount;
+    if (!locksToDrop || m_ownerThread != WTF::currentThread())
         return 0;
 
@@ -260 +260 @@
     }
     m_lock.unlock();
-    return lockCount;
-}
-
-void JSLock::grabAllLocks(unsigned lockCount, SpinLock& spinLock)
+    return locksToDrop;
+}
+
+void JSLock::grabAllLocks(unsigned droppedLockCount, SpinLock& spinLock)
 {
     ASSERT(spinLock.IsHeld());
     // If no locks were dropped, nothing to do!
-    if (!lockCount)
+    if (!droppedLockCount)
         return;
 
@@ -274 +274 @@
     // FIXME: Maybe we want to prohibit this, guard against with an ASSERT?
     if (m_ownerThread == currentThread && m_lockCount) {
-        m_lockCount += lockCount;
+        m_lockCount += droppedLockCount;
         --m_lockDropDepth;
         return;
@@ -285 +285 @@
     m_ownerThread = currentThread;
     ASSERT(!m_lockCount);
-    m_lockCount = lockCount;
+    m_lockCount = droppedLockCount;
     --m_lockDropDepth;
 
@@ -295 +295 @@
 
 JSLock::DropAllLocks::DropAllLocks(ExecState* exec, AlwaysDropLocksTag alwaysDropLocks)
-    : m_lockCount(0)
+    : m_droppedLockCount(0)
     , m_vm(exec ? &exec->vm() : nullptr)
 {
@@ -304 +304 @@
 
     if (alwaysDropLocks)
-        m_lockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
+        m_droppedLockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
     else
-        m_lockCount = m_vm->apiLock().dropAllLocks(spinLock);
+        m_droppedLockCount = m_vm->apiLock().dropAllLocks(spinLock);
 }
 
 JSLock::DropAllLocks::DropAllLocks(VM* vm, AlwaysDropLocksTag alwaysDropLocks)
-    : m_lockCount(0)
+    : m_droppedLockCount(0)
     , m_vm(vm)
 {
@@ -319 +319 @@
 
     if (alwaysDropLocks)
-        m_lockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
+        m_droppedLockCount = m_vm->apiLock().dropAllLocksUnconditionally(spinLock);
     else
-        m_lockCount = m_vm->apiLock().dropAllLocks(spinLock);
+        m_droppedLockCount = m_vm->apiLock().dropAllLocks(spinLock);
 }
 
@@ -330 +330 @@
     SpinLock& spinLock = m_vm->apiLock().m_spinLock;
     SpinLockHolder holder(&spinLock);
-    m_vm->apiLock().grabAllLocks(m_lockCount, spinLock);
+    m_vm->apiLock().grabAllLocks(m_droppedLockCount, spinLock);
 }
 

trunk/Source/JavaScriptCore/runtime/JSLock.h

@@ -109 +109 @@
             
         private:
-            intptr_t m_lockCount;
+            intptr_t m_droppedLockCount;
             RefPtr<VM> m_vm;
         };