Changeset 46431 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jul 27, 2009, 3:07:26 PM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=27735
Give a helpful name to JSLock constructor argument

Location:

trunk/JavaScriptCore/runtime

Files:

• Collector.cpp (modified) (1 diff)
• JSLock.cpp (modified) (13 diffs)
• JSLock.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -171 +171 @@
 void Heap::destroy()
 {
-    JSLock lock(false);
+    JSLock lock(SilenceAssertionsOnly);
 
     if (!m_globalData)

trunk/JavaScriptCore/runtime/JSLock.cpp

@@ -61 +61 @@
 
 JSLock::JSLock(ExecState* exec)
-    : m_lockingForReal(exec->globalData().isSharedInstance)
-{
-    lock(m_lockingForReal);
-}
-
-void JSLock::lock(bool lockForReal)
+    : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly)
+{
+    lock(m_lockBehavior);
+}
+
+void JSLock::lock(JSLockBehavior lockBehavior)
 {
 #ifdef NDEBUG
     // Locking "not for real" is a debug-only feature.
-    if (!lockForReal)
+    if (lockBehavior == SilenceAssertionsOnly)
         return;
 #endif
@@ -77 +77 @@
 
     intptr_t currentLockCount = lockCount();
-    if (!currentLockCount && lockForReal) {
+    if (!currentLockCount && lockBehavior == LockForReal) {
         int result;
         result = pthread_mutex_lock(&JSMutex);
@@ -85 +85 @@
 }
 
-void JSLock::unlock(bool lockForReal)
+void JSLock::unlock(JSLockBehavior lockBehavior)
 {
     ASSERT(lockCount());
@@ -91 +91 @@
 #ifdef NDEBUG
     // Locking "not for real" is a debug-only feature.
-    if (!lockForReal)
+    if (lockBehavior == SilenceAssertionsOnly)
         return;
 #endif
@@ -97 +97 @@
     intptr_t newLockCount = lockCount() - 1;
     setLockCount(newLockCount);
-    if (!newLockCount && lockForReal) {
+    if (!newLockCount && lockBehavior == LockForReal) {
         int result;
         result = pthread_mutex_unlock(&JSMutex);
@@ -106 +106 @@
 void JSLock::lock(ExecState* exec)
 {
-    lock(exec->globalData().isSharedInstance);
+    lock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly);
 }
 
 void JSLock::unlock(ExecState* exec)
 {
-    unlock(exec->globalData().isSharedInstance);
+    unlock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly);
 }
 
@@ -163 +163 @@
 
 JSLock::DropAllLocks::DropAllLocks(ExecState* exec)
-    : m_lockingForReal(exec->globalData().isSharedInstance)
+    : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly)
 {
     pthread_once(&createJSLockCountOnce, createJSLockCount);
@@ -174 +174 @@
     m_lockCount = JSLock::lockCount();
     for (intptr_t i = 0; i < m_lockCount; i++)
-        JSLock::unlock(m_lockingForReal);
-}
-
-JSLock::DropAllLocks::DropAllLocks(bool lockingForReal)
-    : m_lockingForReal(lockingForReal)
+        JSLock::unlock(m_lockBehavior);
+}
+
+JSLock::DropAllLocks::DropAllLocks(JSLockBehavior JSLockBehavior)
+    : m_lockBehavior(JSLockBehavior)
 {
     pthread_once(&createJSLockCountOnce, createJSLockCount);
@@ -192 +192 @@
     m_lockCount = JSLock::lockCount();
     for (intptr_t i = 0; i < m_lockCount; i++)
-        JSLock::unlock(m_lockingForReal);
+        JSLock::unlock(m_lockBehavior);
 }
 
@@ -198 +198 @@
 {
     for (intptr_t i = 0; i < m_lockCount; i++)
-        JSLock::lock(m_lockingForReal);
+        JSLock::lock(m_lockBehavior);
 
     --lockDropDepth;
@@ -206 +206 @@
 
 JSLock::JSLock(ExecState*)
-    : m_lockingForReal(false)
+    : m_lockBehavior(false)
 {
 }
@@ -222 +222 @@
 }
 
-void JSLock::lock(bool)
-{
-}
-
-void JSLock::unlock(bool)
+void JSLock::lock(JSLockBehavior)
+{
+}
+
+void JSLock::unlock(JSLockBehavior)
 {
 }
@@ -242 +242 @@
 }
 
-JSLock::DropAllLocks::DropAllLocks(bool)
+JSLock::DropAllLocks::DropAllLocks(JSLockBehavior)
 {
 }

trunk/JavaScriptCore/runtime/JSLock.h

@@ -51 +51 @@
     class ExecState;
 
+    enum JSLockBehavior { SilenceAssertionsOnly, LockForReal };
+
     class JSLock : public Noncopyable {
     public:
         JSLock(ExecState*);
 
-        JSLock(bool lockingForReal)
-            : m_lockingForReal(lockingForReal)
+        JSLock(JSLockBehavior lockBehavior)
+            : m_lockBehavior(lockBehavior)
         {
 #ifdef NDEBUG
             // Locking "not for real" is a debug-only feature.
-            if (!lockingForReal)
+            if (lockBehavior == SilenceAssertionsOnly)
                 return;
 #endif
-            lock(lockingForReal);
+            lock(lockBehavior);
         }
 
@@ -70 +72 @@
 #ifdef NDEBUG
             // Locking "not for real" is a debug-only feature.
-            if (!m_lockingForReal)
+            if (lockBehavior == SilenceAssertionsOnly)
                 return;
 #endif
-            unlock(m_lockingForReal); 
+            unlock(m_lockBehavior); 
         }
         
-        static void lock(bool);
-        static void unlock(bool);
+        static void lock(JSLockBehavior);
+        static void unlock(JSLockBehavior);
         static void lock(ExecState*);
         static void unlock(ExecState*);
@@ -84 +86 @@
         static bool currentThreadIsHoldingLock();
 
-        bool m_lockingForReal;
+        JSLockBehavior m_lockBehavior;
 
         class DropAllLocks : public Noncopyable {
         public:
             DropAllLocks(ExecState* exec);
-            DropAllLocks(bool);
+            DropAllLocks(JSLockBehavior);
             ~DropAllLocks();
             
         private:
             intptr_t m_lockCount;
-            bool m_lockingForReal;
+            JSLockBehavior m_lockBehavior;
         };
     };