Changeset 293320 in webkit

Timestamp:

Apr 25, 2022, 4:47:39 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (249585@main): TestWebKitAPI.IPCTestingAPI.CanReceiveIPCSemaphore is timing out
​https://bugs.webkit.org/show_bug.cgi?id=239507

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2022-04-25
Reviewed by Wenson Hsieh.

Source/WebKit:

Add purpose-built test interfaces for testing sending IPC::Semaphore via the IPC.

Test: ipc/send-semaphore.html

• Shared/IPCTester.cpp:

(WebKit::IPCTester::sendSameSemaphoreBack):
(WebKit::IPCTester::sendSemaphoreBackAndSignalProtocol):

• Shared/IPCTester.h:
• Shared/IPCTester.messages.in:

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/IPCTestingAPI.mm:

Move CanReceiveIPCSemaphore and CanSendIPCSemaphore test logic
to LayoutTests/ipc/send-semaphore.html
The tests were using audio and canvas implementation detail
messages to test that IPC system can send IPC::Semaphore via IPC.
Canvas implementation details changed and the test started
to fail.

The new tests use IPC messages that are purpose-built to test this
feature. The new tests also actually test that the sent semaphores
work.

LayoutTests:

• ipc/send-semaphore-expected.txt: Added.
• ipc/send-semaphore.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/ipc/send-semaphore-expected.txt (added)
• LayoutTests/ipc/send-semaphore.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/IPCTester.cpp (modified) (2 diffs)
• Source/WebKit/Shared/IPCTester.h (modified) (1 diff)
• Source/WebKit/Shared/IPCTester.messages.in (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/IPCTestingAPI.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-25  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        REGRESSION (249585@main): TestWebKitAPI.IPCTestingAPI.CanReceiveIPCSemaphore is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=239507
+
+        Reviewed by Wenson Hsieh.
+
+        * ipc/send-semaphore-expected.txt: Added.
+        * ipc/send-semaphore.html: Added.
+
 2022-04-24  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-04-25  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        REGRESSION (249585@main): TestWebKitAPI.IPCTestingAPI.CanReceiveIPCSemaphore is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=239507
+
+        Reviewed by Wenson Hsieh.
+
+        Add purpose-built test interfaces for testing sending IPC::Semaphore via the IPC.
+
+        Test: ipc/send-semaphore.html
+
+        * Shared/IPCTester.cpp:
+        (WebKit::IPCTester::sendSameSemaphoreBack):
+        (WebKit::IPCTester::sendSemaphoreBackAndSignalProtocol):
+        * Shared/IPCTester.h:
+        * Shared/IPCTester.messages.in:
+
 2022-04-24  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/Shared/IPCTester.cpp

@@ -31 +31 @@
 #include "Decoder.h"
 #include "IPCStreamTester.h"
+#include "IPCTesterMessages.h"
 
 #include <atomic>
@@ -146 +147 @@
 }
 
+void IPCTester::sendSameSemaphoreBack(IPC::Connection& connection, IPC::Semaphore&& semaphore)
+{
+    connection.send(Messages::IPCTester::SendSameSemaphoreBack(semaphore), 0);
+}
+
+void IPCTester::sendSemaphoreBackAndSignalProtocol(IPC::Connection& connection, IPC::Semaphore&& semaphore)
+{
+    IPC::Semaphore newSemaphore;
+    connection.send(Messages::IPCTester::SendSemaphoreBackAndSignalProtocol(newSemaphore), 0);
+    if (!semaphore.waitFor(10_s)) {
+        ASSERT_IS_TESTING_IPC();
+        return;
+    }
+    newSemaphore.signal();
+    // Wait for protocol commit. Otherwise newSemaphore will be destroyed, and the waiter on the other side
+    // will fail to wait.
+    if (!semaphore.waitFor(10_s)) {
+        ASSERT_IS_TESTING_IPC();
+        return;
+    }
+}
+
 void IPCTester::stopIfNeeded()
 {

trunk/Source/WebKit/Shared/IPCTester.h

@@ -70 +70 @@
     void createStreamTester(IPC::Connection&, IPCStreamTesterIdentifier, IPC::StreamConnectionBuffer&&);
     void releaseStreamTester(IPCStreamTesterIdentifier, CompletionHandler<void()>&&);
+    void sendSameSemaphoreBack(IPC::Connection&, IPC::Semaphore&&);
+    void sendSemaphoreBackAndSignalProtocol(IPC::Connection&, IPC::Semaphore&&);
 
     void stopIfNeeded();

trunk/Source/WebKit/Shared/IPCTester.messages.in

@@ -28 +28 @@
     CreateStreamTester(WebKit::IPCStreamTesterIdentifier identifier, IPC::StreamConnectionBuffer stream) WantsConnection
     ReleaseStreamTester(WebKit::IPCStreamTesterIdentifier identifier) -> () Synchronous
+
+    SendSameSemaphoreBack(IPC::Semaphore semaphore) WantsConnection
+    SendSemaphoreBackAndSignalProtocol(IPC::Semaphore semaphore) WantsConnection
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2022-04-25  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        REGRESSION (249585@main): TestWebKitAPI.IPCTestingAPI.CanReceiveIPCSemaphore is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=239507
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/IPCTestingAPI.mm:
+        Move CanReceiveIPCSemaphore and CanSendIPCSemaphore test logic
+        to LayoutTests/ipc/send-semaphore.html
+        The tests were using audio and canvas implementation detail
+        messages to test that IPC system can send IPC::Semaphore via IPC.
+        Canvas implementation details changed and the test started
+        to fail.
+
+        The new tests use IPC messages that are purpose-built to test this
+        feature. The new tests also actually test that the sent semaphores
+        work.
+
 2022-04-16  Philippe Normand  <philn@igalia.com>
 

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

@@ -287 +287 @@
 }
 
-TEST(IPCTestingAPI, CanReceiveIPCSemaphore)
-{
-    auto webView = createWebViewWithIPCTestingAPI();
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    done = false;
-    auto html = @"<!DOCTYPE html>"
-        "<script>"
-        "const bufferSize = 1 << 16;"
-        "const streamConnection = IPC.createStreamClientConnection('GPU', bufferSize);"
-        "IPC.sendMessage('GPU', 0, IPC.messages.GPUConnectionToWebProcess_CreateRenderingBackend.name, ["
-        "    { type: 'RemoteRenderingBackendCreationParameters', 'identifier': 123, 'pageProxyID': IPC.webPageProxyID, 'pageID': IPC.pageID },"
-        "    { type: 'StreamConnectionBuffer', value: streamConnection.streamBuffer() },"
-        "]);"
-        "const arguments = IPC.waitForMessage('GPU', 123, IPC.messages.RemoteRenderingBackendProxy_DidCreateWakeUpSemaphoreForDisplayListStream.name, 100);"
-        "alert(arguments.length + ':' + arguments[0].type + ':' + arguments[0].value.waitFor(100));"
-        "</script>";
-    [webView synchronouslyLoadHTMLString:html];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_STREQ([alertMessage UTF8String], "1:Semaphore:false");
-}
-
 #endif // ENABLE(GPU_PROCESS)
-
-TEST(IPCTestingAPI, CanCreateIPCSemaphore)
-{
-    auto webView = createWebViewWithIPCTestingAPI();
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    done = false;
-    [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><script>alert(IPC.createSemaphore().waitFor(100));</script>"];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_FALSE([alertMessage boolValue]);
-}
 
 TEST(IPCTestingAPI, CanCreateSharedMemory)
@@ -345 +306 @@
     EXPECT_EQ([webView stringByEvaluatingJavaScript:@"sharedMemory.writeBytes(new Int8Array([101, 102, 103, 104, 105, 106]), 2, 3)"].intValue, 0);
     EXPECT_STREQ([webView stringByEvaluatingJavaScript:@"Array.from(new Int8Array(sharedMemory.readBytes())).toString()"].UTF8String, "1,2,101,102,103,32,0,0");
-}
-
-TEST(IPCTestingAPI, CanSendSemaphore)
-{
-    auto webView = createWebViewWithIPCTestingAPI();
-
-    auto delegate = adoptNS([[IPCTestingAPIDelegate alloc] init]);
-    [webView setUIDelegate:delegate.get()];
-
-    auto* html = @R"HTML(<!DOCTYPE html>
-<body>
-<script>
-const audioContext = new AudioContext;
-const destination = audioContext.createMediaStreamDestination();
-const semaphore = IPC.createSemaphore();
-const result = IPC.sendSyncMessage('GPU', 0, IPC.messages.RemoteAudioDestinationManager_CreateAudioDestination.name, 100,
-    [{type: 'String', value: 'some device'},
-    {type: 'uint32_t', value: destination.numberOfInputs},
-    {type: 'uint32_t', value: destination.channelCount},
-    {type: 'float', value: audioContext.sampleRate}, {type: 'float', value: audioContext.sampleRate},
-    {type: 'Semaphore', value: semaphore}]);
-alert(result.arguments[0].type);
-</script>
-</body>)HTML";
-
-    done = false;
-    [webView synchronouslyLoadHTMLString:html];
-    TestWebKitAPI::Util::run(&done);
-
-    EXPECT_STREQ([alertMessage UTF8String], "uint64_t");
 }