Changeset 218705 in webkit

Timestamp:

Jun 22, 2017 10:34:35 AM (7 years ago)

Author:

beidson@apple.com

Message:

Add some thread safety guards to GenericCallback.
​https://bugs.webkit.org/show_bug.cgi?id=173693

Reviewed by Sam Weinig.

A callback should be created, performed, invalidated, and/or destroyed all on the same thread.
Let's write code to notify us if that doesn't happen.

• UIProcess/GenericCallback.h:

(WebKit::GenericCallback::~GenericCallback):
(WebKit::GenericCallback::performCallbackWithReturnValue):
(WebKit::GenericCallback::invalidate):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/GenericCallback.h (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-22  Brady Eidson  <beidson@apple.com>
+
+        Add some thread safety guards to GenericCallback.
+        https://bugs.webkit.org/show_bug.cgi?id=173693
+
+        Reviewed by Sam Weinig.
+
+        A callback should be created, performed, invalidated, and/or destroyed all on the same thread.
+        Let's write code to notify us if that doesn't happen.
+
+        * UIProcess/GenericCallback.h:
+        (WebKit::GenericCallback::~GenericCallback):
+        (WebKit::GenericCallback::performCallbackWithReturnValue):
+        (WebKit::GenericCallback::invalidate):
+
 2017-06-22  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit2/UIProcess/GenericCallback.h

@@ -36 +36 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RunLoop.h>
+#include <wtf/Threading.h>
 
 namespace WebKit {
@@ -101 +102 @@
     virtual ~GenericCallback()
     {
+        ASSERT(currentThread() == m_originThreadID);
         ASSERT(!m_callback);
     }
@@ -106 +108 @@
     void performCallbackWithReturnValue(T... returnValue)
     {
+        ASSERT(currentThread() == m_originThreadID);
+
         if (!m_callback)
             return;
@@ -121 +125 @@
     void invalidate(Error error = Error::Unknown) final
     {
+        ASSERT(currentThread() == m_originThreadID);
+
         if (!m_callback)
             return;
@@ -144 +150 @@
 
     std::optional<CallbackFunction> m_callback;
+
+#ifndef NDEBUG
+    ThreadIdentifier m_originThreadID { currentThread() };
+#endif
 };