Changeset 280951 in webkit

Timestamp:

Aug 11, 2021, 6:11:15 PM (5 years ago)

Author:

Peng Liu

Message:

[ BigSur Debug ] TestWebKitAPI.GPUProcess.CrashWhilePlayingAudioViaCreateMediaElementSource is flaky, hitting ASSERTION FAILED: !isInRoutingArbitrationForToken(token)
​https://bugs.webkit.org/show_bug.cgi?id=227728
<rdar://problem/80237464>

Reviewed by Jer Noble.

Source/WebKit:

After the GPU process crashes, the UI process will clean up the
SharedRoutingArbitrator, while a WebContent process might be resuming
the media playback and setup AudioSessionRoutingArbitrator.
There is a race condition here. If the WebContent process runs faster,
SharedRoutingArbitrator in the UI process will try to begin a duplicated
routing arbitration and lead to an assertion failure.

No new tests. Fixed following two API test failures:

• TestWebKitAPI.WebKit2.CrashGPUProcessWhileCapturing
• TestWebKitAPI.GPUProcess.CrashWhilePlayingAudioViaCreateMediaElementSource

• UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm:

(WebKit::AudioSessionRoutingArbitratorProxy::processDidTerminate):

• WebProcess/GPU/GPUProcessConnection.cpp:

(WebKit::GPUProcessConnection::didClose):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/GPUProcess.mm:

(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm (modified) (1 diff)
• Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/GPUProcess.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        [ BigSur Debug ] TestWebKitAPI.GPUProcess.CrashWhilePlayingAudioViaCreateMediaElementSource is flaky, hitting ASSERTION FAILED: !isInRoutingArbitrationForToken(token)
+        https://bugs.webkit.org/show_bug.cgi?id=227728
+        <rdar://problem/80237464>
+
+        Reviewed by Jer Noble.
+
+        After the GPU process crashes, the UI process will clean up the
+        `SharedRoutingArbitrator`, while a WebContent process might be resuming
+        the media playback and setup `AudioSessionRoutingArbitrator`.
+        There is a race condition here. If the WebContent process runs faster,
+        `SharedRoutingArbitrator` in the UI process will try to begin a duplicated
+        routing arbitration and lead to an assertion failure.
+
+        No new tests. Fixed following two API test failures:
+        - TestWebKitAPI.WebKit2.CrashGPUProcessWhileCapturing
+        - TestWebKitAPI.GPUProcess.CrashWhilePlayingAudioViaCreateMediaElementSource
+
+        * UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm:
+        (WebKit::AudioSessionRoutingArbitratorProxy::processDidTerminate):
+        * WebProcess/GPU/GPUProcessConnection.cpp:
+        (WebKit::GPUProcessConnection::didClose):
+
 2021-08-11  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm

@@ -53 +53 @@
 void AudioSessionRoutingArbitratorProxy::processDidTerminate()
 {
-    if (SharedRoutingArbitrator::sharedInstance().isInRoutingArbitrationForToken(m_token))
-        endRoutingArbitration();
 }
 

trunk/Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp

@@ -128 +128 @@
     WebProcess::singleton().gpuProcessConnectionClosed(*this);
 
+#if ENABLE(ROUTING_ARBITRATION)
+    if (auto* arbitrator = WebProcess::singleton().supplement<AudioSessionRoutingArbitrator>())
+        arbitrator->leaveRoutingAbritration();
+#endif
+
     auto clients = m_clients;
     for (auto& client : clients)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-11  Peng Liu  <peng.liu6@apple.com>
+
+        [ BigSur Debug ] TestWebKitAPI.GPUProcess.CrashWhilePlayingAudioViaCreateMediaElementSource is flaky, hitting ASSERTION FAILED: !isInRoutingArbitrationForToken(token)
+        https://bugs.webkit.org/show_bug.cgi?id=227728
+        <rdar://problem/80237464>
+
+        Reviewed by Jer Noble.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/GPUProcess.mm:
+        (TEST):
+
 2021-08-11  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/GPUProcess.mm

@@ -369 +369 @@
 }
 
-// FIXME: Re-enable this test once <rdar://80237464> is resolved
-TEST(GPUProcess, DISABLED_CrashWhilePlayingAudioViaCreateMediaElementSource)
+TEST(GPUProcess, CrashWhilePlayingAudioViaCreateMediaElementSource)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);