Changeset 275922 in webkit

Timestamp:

Apr 13, 2021, 6:00:24 PM (5 years ago)

Author:

Chris Dumez

Message:

RemoteRenderingBackendProxy should only relaunch the GPUProcess if it actually needs it
​https://bugs.webkit.org/show_bug.cgi?id=224516

Reviewed by Geoff Garen.

Previously, RemoteRenderingBackendProxy would launch the GPUProcess as soon as it was
constructed. This went against the goals of r275887 to delay the GPUProcess launch
until it is actually needed. Also, in case a a GPUProcess crash/termination,
RemoteRenderingBackendProxy would relaunch the GPUProcess right away, even if it
did not need it (No live ImageBuffers). This patch addresses both issues.

This patch is a pre-requirement for terminating the GPUProcess on memory pressure when
it is not used by any tabs.

• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:

(WebKit::RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy):
(WebKit::RemoteRenderingBackendProxy::ensureGPUProcessConnection):
(WebKit::RemoteRenderingBackendProxy::gpuProcessConnectionDidClose):
(WebKit::RemoteRenderingBackendProxy::messageSenderConnection const):
(WebKit::RemoteRenderingBackendProxy::waitForDidCreateImageBufferBackend):
(WebKit::RemoteRenderingBackendProxy::waitForDidFlush):

• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (modified) (5 diffs)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-13  Chris Dumez  <cdumez@apple.com>
+
+        RemoteRenderingBackendProxy should only relaunch the GPUProcess if it actually needs it
+        https://bugs.webkit.org/show_bug.cgi?id=224516
+
+        Reviewed by Geoff Garen.
+
+        Previously, RemoteRenderingBackendProxy would launch the GPUProcess as soon as it was
+        constructed. This went against the goals of r275887 to delay the GPUProcess launch
+        until it is actually needed. Also, in case a a GPUProcess crash/termination,
+        RemoteRenderingBackendProxy would relaunch the GPUProcess right away, even if it
+        did not need it (No live ImageBuffers). This patch addresses both issues.
+
+        This patch is a pre-requirement for terminating the GPUProcess on memory pressure when
+        it is not used by any tabs.
+
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+        (WebKit::RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy):
+        (WebKit::RemoteRenderingBackendProxy::ensureGPUProcessConnection):
+        (WebKit::RemoteRenderingBackendProxy::gpuProcessConnectionDidClose):
+        (WebKit::RemoteRenderingBackendProxy::messageSenderConnection const):
+        (WebKit::RemoteRenderingBackendProxy::waitForDidCreateImageBufferBackend):
+        (WebKit::RemoteRenderingBackendProxy::waitForDidFlush):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h:
+
 2021-04-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp

@@ -56 +56 @@
     }
 {
-    connectToGPUProcess();
 }
 
 RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy()
 {
+    if (!m_gpuProcessConnection)
+        return;
+
     // Un-register itself as a MessageReceiver.
-    IPC::MessageReceiverMap& messageReceiverMap = WebProcess::singleton().ensureGPUProcessConnection().messageReceiverMap();
-    messageReceiverMap.removeMessageReceiver(*this);
+    m_gpuProcessConnection->messageReceiverMap().removeMessageReceiver(*this);
 
     // Release the RemoteRenderingBackend.
@@ -69 +70 @@
 }
 
-void RemoteRenderingBackendProxy::connectToGPUProcess()
-{
-    auto& connection = WebProcess::singleton().ensureGPUProcessConnection();
-    connection.addClient(*this);
-    connection.messageReceiverMap().addMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), renderingBackendIdentifier().toUInt64(), *this);
-    send(Messages::GPUConnectionToWebProcess::CreateRenderingBackend(m_parameters), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
-}
-
-void RemoteRenderingBackendProxy::reestablishGPUProcessConnection()
-{
-    connectToGPUProcess();
+GPUProcessConnection& RemoteRenderingBackendProxy::ensureGPUProcessConnection()
+{
+    if (!m_gpuProcessConnection) {
+        auto& gpuProcessConnection = WebProcess::singleton().ensureGPUProcessConnection();
+        gpuProcessConnection.addClient(*this);
+        gpuProcessConnection.messageReceiverMap().addMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), renderingBackendIdentifier().toUInt64(), *this);
+        gpuProcessConnection.connection().send(Messages::GPUConnectionToWebProcess::CreateRenderingBackend(m_parameters), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
+        m_gpuProcessConnection = makeWeakPtr(gpuProcessConnection);
+    }
+    return *m_gpuProcessConnection;
+}
+
+void RemoteRenderingBackendProxy::gpuProcessConnectionDidClose(GPUProcessConnection& previousConnection)
+{
+    previousConnection.removeClient(*this);
+    m_gpuProcessConnection = nullptr;
+
+    m_identifiersOfReusableHandles.clear();
+    m_sharedDisplayListHandles.clear();
+    m_currentDestinationImageBufferIdentifier = WTF::nullopt;
+    m_deferredWakeupMessageArguments = WTF::nullopt;
+    m_remainingItemsToAppendBeforeSendingWakeup = 0;
 
     for (auto& imageBuffer : m_remoteResourceCacheProxy.imageBuffers().values()) {
@@ -89 +101 @@
 }
 
-void RemoteRenderingBackendProxy::gpuProcessConnectionDidClose(GPUProcessConnection& previousConnection)
-{
-    previousConnection.removeClient(*this);
-
-    m_identifiersOfReusableHandles.clear();
-    m_sharedDisplayListHandles.clear();
-    m_currentDestinationImageBufferIdentifier = WTF::nullopt;
-    m_deferredWakeupMessageArguments = WTF::nullopt;
-    m_remainingItemsToAppendBeforeSendingWakeup = 0;
-
-    reestablishGPUProcessConnection();
-}
-
 IPC::Connection* RemoteRenderingBackendProxy::messageSenderConnection() const
 {
-    return &WebProcess::singleton().ensureGPUProcessConnection().connection();
+    return &const_cast<RemoteRenderingBackendProxy&>(*this).ensureGPUProcessConnection().connection();
 }
 
@@ -114 +113 @@
 RemoteRenderingBackendProxy::DidReceiveBackendCreationResult RemoteRenderingBackendProxy::waitForDidCreateImageBufferBackend()
 {
-    Ref<IPC::Connection> connection = WebProcess::singleton().ensureGPUProcessConnection().connection();
+    auto connection = makeRefPtr(messageSenderConnection());
     if (!connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::DidCreateImageBufferBackend>(renderingBackendIdentifier(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives))
         return DidReceiveBackendCreationResult::TimeoutOrIPCFailure;
@@ -122 +121 @@
 bool RemoteRenderingBackendProxy::waitForDidFlush()
 {
-    Ref<IPC::Connection> connection = WebProcess::singleton().ensureGPUProcessConnection().connection();
+    auto connection = makeRefPtr(messageSenderConnection());
     return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::DidFlush>(renderingBackendIdentifier(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
 }

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h

@@ -117 +117 @@
     void gpuProcessConnectionDidClose(GPUProcessConnection&) final;
 
-    void connectToGPUProcess();
-    void reestablishGPUProcessConnection();
+    GPUProcessConnection& ensureGPUProcessConnection();
 
     // Messages to be received.
@@ -140 +139 @@
     uint64_t m_getImageDataSharedMemoryLength { 0 };
     WebCore::Timer m_destroyGetImageDataSharedMemoryTimer { *this, &RemoteRenderingBackendProxy::destroyGetImageDataSharedMemory };
+    WeakPtr<GPUProcessConnection> m_gpuProcessConnection;
 };