Changeset 249064 in webkit

Timestamp:

Aug 23, 2019, 1:31:08 PM (7 years ago)

Author:

Chris Dumez

Message:

Regression(r248533) Assertion hit in isMainThread() for some clients using WTF because the main thread is not initialized
​https://bugs.webkit.org/show_bug.cgi?id=201083

Reviewed by Alex Christensen.

An assertion is hit in isMainThread() for some clients using WTF because the main thread is not initialized, since r248533.
Clients can work around this by calling WTF::initializeMainThread() before using WTF but it seems unfortunate to force them
to do so. I propose we disable the assertion until the main thread is initialized.

• wtf/MainThread.h:
• wtf/RefCounted.h:

(WTF::RefCountedBase::RefCountedBase):
(WTF::RefCountedBase::applyRefDerefThreadingCheck const):

• wtf/cocoa/MainThreadCocoa.mm:

(WTF::isMainThreadInitialized):

• wtf/generic/MainThreadGeneric.cpp:

(WTF::isMainThreadInitialized):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MainThread.h (modified) (1 diff)
• wtf/RefCounted.h (modified) (2 diffs)
• wtf/cocoa/MainThreadCocoa.mm (modified) (2 diffs)
• wtf/generic/MainThreadGeneric.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-08-23  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r248533) Assertion hit in isMainThread() for some clients using WTF because the main thread is not initialized
+        https://bugs.webkit.org/show_bug.cgi?id=201083
+
+        Reviewed by Alex Christensen.
+
+        An assertion is hit in isMainThread() for some clients using WTF because the main thread is not initialized, since r248533.
+        Clients can work around this by calling WTF::initializeMainThread() before using WTF but it seems unfortunate to force them
+        to do so. I propose we disable the assertion until the main thread is initialized.
+
+        * wtf/MainThread.h:
+        * wtf/RefCounted.h:
+        (WTF::RefCountedBase::RefCountedBase):
+        (WTF::RefCountedBase::applyRefDerefThreadingCheck const):
+        * wtf/cocoa/MainThreadCocoa.mm:
+        (WTF::isMainThreadInitialized):
+        * wtf/generic/MainThreadGeneric.cpp:
+        (WTF::isMainThreadInitialized):
+
 2019-08-21  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WTF/wtf/MainThread.h

@@ -55 +55 @@
 WTF_EXPORT_PRIVATE bool isMainThread();
 WTF_EXPORT_PRIVATE bool isMainThreadIfInitialized();
+WTF_EXPORT_PRIVATE bool isMainThreadInitialized();
 
 WTF_EXPORT_PRIVATE bool canAccessThreadLocalDataForThread(Thread&);

trunk/Source/WTF/wtf/RefCounted.h

@@ -92 +92 @@
         : m_refCount(1)
 #if !ASSERT_DISABLED
-        , m_isOwnedByMainThread(isMainThread())
+        , m_isOwnedByMainThread(isMainThreadIfInitialized())
+        , m_areThreadingChecksEnabled(isMainThreadInitialized())
 #endif
 #if CHECK_REF_COUNTED_LIFECYCLE
@@ -106 +107 @@
         if (hasOneRef()) {
             // Likely an ownership transfer across threads that may be safe.
-            m_isOwnedByMainThread = isMainThread();
+            m_isOwnedByMainThread = isMainThreadIfInitialized();
         } else if (areThreadingChecksEnabledGlobally && m_areThreadingChecksEnabled) {
             // If you hit this assertion, it means that the RefCounted object was ref/deref'd

trunk/Source/WTF/wtf/cocoa/MainThreadCocoa.mm

@@ -182 +182 @@
 }
 
+bool isMainThreadInitialized()
+{
+    return true;
+}
+
 bool isUIThread()
 {
@@ -240 +245 @@
 }
 
+bool isMainThreadInitialized()
+{
+    return mainThreadEstablishedAsPthreadMain || mainThreadPthread;
+}
+
 #endif // USE(WEB_THREAD)
 

trunk/Source/WTF/wtf/generic/MainThreadGeneric.cpp

@@ -93 +93 @@
 }
 
+bool isMainThreadInitialized()
+{
+    return true;
+}
+
 void scheduleDispatchFunctionsOnMainThread()
 {