Changeset 256678 in webkit

Timestamp:

Feb 14, 2020 7:01:54 PM (4 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r256474. rdar://problem/59446973

Web Inspector: inspector/cpu-profiler/threads.html is flaky crashing
​https://bugs.webkit.org/show_bug.cgi?id=207588
<rdar://problem/57458123>

Reviewed by Yusuke Suzuki.

• page/cocoa/ResourceUsageThreadCocoa.mm: (WebCore::ResourceUsageThread::platformCollectCPUData): Use a fence to force Thread to be completely ready for use by other threads prior to storing it. Otherwise, ResourceUsageThread may see it too early.

• workers/WorkerThread.cpp: (WebCore::WorkerThread::start): Ignore worker threads that are not fully initialized.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@256474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/cocoa/ResourceUsageThreadCocoa.mm (modified) (1 diff)
• workers/WorkerThread.cpp (modified) (1 diff)

branches/safari-609-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-14  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r256474. rdar://problem/59446973
+
+    Web Inspector: inspector/cpu-profiler/threads.html is flaky crashing
+    https://bugs.webkit.org/show_bug.cgi?id=207588
+    <rdar://problem/57458123>
+    
+    Reviewed by Yusuke Suzuki.
+    
+    * page/cocoa/ResourceUsageThreadCocoa.mm:
+    (WebCore::ResourceUsageThread::platformCollectCPUData):
+    Use a fence to force Thread to be completely ready for use by other threads
+    prior to storing it. Otherwise, ResourceUsageThread may see it too early.
+    
+    * workers/WorkerThread.cpp:
+    (WebCore::WorkerThread::start): Ignore worker threads that are
+    not fully initialized.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256474 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-02-12  Brian Burg  <bburg@apple.com>
+
+            Web Inspector: inspector/cpu-profiler/threads.html is flaky crashing
+            https://bugs.webkit.org/show_bug.cgi?id=207588
+            <rdar://problem/57458123>
+
+            Reviewed by Yusuke Suzuki.
+
+            * page/cocoa/ResourceUsageThreadCocoa.mm:
+            (WebCore::ResourceUsageThread::platformCollectCPUData):
+            Use a fence to force Thread to be completely ready for use by other threads
+            prior to storing it. Otherwise, ResourceUsageThread may see it too early.
+
+            * workers/WorkerThread.cpp:
+            (WebCore::WorkerThread::start): Ignore worker threads that are
+            not fully initialized.
+
 2020-02-14  Russell Epstein  <repstein@apple.com>
 

branches/safari-609-branch/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

@@ -169 +169 @@
         LockHolder lock(WorkerThread::workerThreadsMutex());
         for (auto* thread : WorkerThread::workerThreads(lock)) {
+            // Ignore worker threads that have not been fully started yet.
+            if (!thread->thread())
+                continue;
             mach_port_t machThread = thread->thread()->machThread();
             if (machThread != MACH_PORT_NULL)

branches/safari-609-branch/Source/WebCore/workers/WorkerThread.cpp

@@ -144 +144 @@
     m_evaluateCallback = WTFMove(evaluateCallback);
 
-    m_thread = Thread::create(isServiceWorkerThread() ? "WebCore: Service Worker" : "WebCore: Worker", [this] {
+    Ref<Thread> thread = Thread::create(isServiceWorkerThread() ? "WebCore: Service Worker" : "WebCore: Worker", [this] {
         workerThread();
     });
+    // Force the Thread object to be initialized fully before storing it to m_thread (and becoming visible to other threads).
+    WTF::storeStoreFence();
+    m_thread = WTFMove(thread);
 }