Changeset 92523 in webkit

Timestamp:

Aug 5, 2011 3:36:51 PM (13 years ago)

Author:

mrowe@apple.com

Message:

<​http://webkit.org/b/65785> ThreadRestrictionVerifier needs a mode where an object
is tied to a particular dispatch queue

A RefCounted object can be opted in to this mode by calling setDispatchQueueForVerifier
with the dispatch queue it will be tied to. This will cause ThreadRestrictionVerifier
to ensure that all operations are performed on the given dispatch queue.

Reviewed by Anders Carlsson.

• wtf/RefCounted.h:

(WTF::RefCountedBase::setDispatchQueueForVerifier):

• wtf/ThreadRestrictionVerifier.h:

(WTF::ThreadRestrictionVerifier::ThreadRestrictionVerifier):
(WTF::ThreadRestrictionVerifier::~ThreadRestrictionVerifier):
(WTF::ThreadRestrictionVerifier::setDispatchQueueMode):
(WTF::ThreadRestrictionVerifier::setShared):
(WTF::ThreadRestrictionVerifier::isSafeToUse):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/RefCounted.h (modified) (2 diffs)
• wtf/ThreadRestrictionVerifier.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-08-05  Mark Rowe  <mrowe@apple.com>
+
+        <http://webkit.org/b/65785> ThreadRestrictionVerifier needs a mode where an object
+        is tied to a particular dispatch queue
+
+        A RefCounted object can be opted in to this mode by calling setDispatchQueueForVerifier
+        with the dispatch queue it will be tied to. This will cause ThreadRestrictionVerifier
+        to ensure that all operations are performed on the given dispatch queue.
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/RefCounted.h:
+        (WTF::RefCountedBase::setDispatchQueueForVerifier):
+        * wtf/ThreadRestrictionVerifier.h:
+        (WTF::ThreadRestrictionVerifier::ThreadRestrictionVerifier):
+        (WTF::ThreadRestrictionVerifier::~ThreadRestrictionVerifier):
+        (WTF::ThreadRestrictionVerifier::setDispatchQueueMode):
+        (WTF::ThreadRestrictionVerifier::setShared):
+        (WTF::ThreadRestrictionVerifier::isSafeToUse):
+
 2011-08-05  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/wtf/RefCounted.h

@@ -72 +72 @@
     void setMutexForVerifier(Mutex&);
 
+#if HAVE(DISPATCH_H)
+    void setDispatchQueueForVerifier(dispatch_queue_t);
+#endif
+
     // Turns off verification. Use of this method is discouraged (instead extend
     // ThreadRestrictionVerifier to verify your case).
@@ -213 +217 @@
 #endif
 
+#if HAVE(DISPATCH_H)
+#ifdef NDEBUG
+inline void RefCountedBase::setDispatchQueueForVerifier(dispatch_queue_t) { }
+#else
+inline void RefCountedBase::setDispatchQueueForVerifier(dispatch_queue_t queue)
+{
+    m_verifier.setDispatchQueueMode(queue);
+}
+#endif // NDEBUG
+#endif // HAVE(DISPATCH_H)
+
 } // namespace WTF
 

trunk/Source/JavaScriptCore/wtf/ThreadRestrictionVerifier.h

@@ -36 +36 @@
 #include <wtf/ThreadingPrimitives.h>
 
+#if HAVE(DISPATCH_H)
+#include <dispatch/dispatch.h>
+#endif
+
 #ifndef NDEBUG
 
@@ -51 +55 @@
         , m_owningThread(0)
         , m_mutex(0)
+#if HAVE(DISPATCH_H)
+        , m_owningQueue(0)
+#endif
     {
     }
+
+#if HAVE(DISPATCH_H)
+    ~ThreadRestrictionVerifier()
+    {
+        if (m_owningQueue)
+            dispatch_release(m_owningQueue);
+    }
+#endif
 
     void setMutexMode(Mutex& mutex)
@@ -60 +75 @@
         m_mutex = &mutex;
     }
+
+#if HAVE(DISPATCH_H)
+    void setDispatchQueueMode(dispatch_queue_t queue)
+    {
+        ASSERT(m_mode == SingleThreadVerificationMode);
+        m_mode = SingleDispatchQueueVerificationMode;
+        m_owningQueue = queue;
+        dispatch_retain(m_owningQueue);
+    }
+#endif
 
     void turnOffVerification()
@@ -83 +108 @@
             return;
 
+#if HAVE(DISPATCH_H)
+        case SingleDispatchQueueVerificationMode:
+#endif
         case MutexVerificationMode:
         case NoVerificationMode:
@@ -106 +134 @@
             return false;
 
+#if HAVE(DISPATCH_H)
+        case SingleDispatchQueueVerificationMode:
+            return m_owningQueue == dispatch_get_current_queue();
+#endif
+
         case NoVerificationMode:
             return true;
@@ -117 +150 @@
         SingleThreadVerificationMode,
         MutexVerificationMode,
-        NoVerificationMode
+        NoVerificationMode,
+#if HAVE(DISPATCH_H)
+        SingleDispatchQueueVerificationMode,
+#endif
     };
 
@@ -128 +164 @@
     // Used by MutexVerificationMode.
     Mutex* m_mutex;
+
+#if HAVE(DISPATCH_H)
+    // Used by SingleDispatchQueueVerificationMode.
+    dispatch_queue_t m_owningQueue;
+#endif
 };