Changeset 245913 in webkit

Timestamp:

May 30, 2019 5:08:04 PM (5 years ago)

Author:

youenn@apple.com

Message:

REGRESSION (r245873) [Mac WK2] Layout Test http/wpt/service-workers/update-service-worker.https.html is a flaky crash after running new test
​https://bugs.webkit.org/show_bug.cgi?id=198379
<rdar://problem/51264361>

Reviewed by Alex Christensen.

This case can happen when network process is crashing.
Given the WebSWClientConnection may be kept alive, it might reregister itself but in that case will never be unregistered.
Remove the WebSWClientConnection from the NetworkProcessConnection corresponding map on destruction time.
Covered by no longer crashing tests.

• WebProcess/Network/NetworkProcessConnection.cpp:

(WebKit::NetworkProcessConnection::removeSWClientConnection):

• WebProcess/Network/NetworkProcessConnection.h:
• WebProcess/Storage/WebSWClientConnection.cpp:

(WebKit::WebSWClientConnection::~WebSWClientConnection):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Network/NetworkProcessConnection.cpp (modified) (1 diff)
• WebProcess/Network/NetworkProcessConnection.h (modified) (1 diff)
• WebProcess/Storage/WebSWClientConnection.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-30  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r245873) [Mac WK2] Layout Test http/wpt/service-workers/update-service-worker.https.html is a flaky crash after running new test
+        https://bugs.webkit.org/show_bug.cgi?id=198379
+        <rdar://problem/51264361>
+
+        Reviewed by Alex Christensen.
+
+        This case can happen when network process is crashing.
+        Given the WebSWClientConnection may be kept alive, it might reregister itself but in that case will never be unregistered.
+        Remove the WebSWClientConnection from the NetworkProcessConnection corresponding map on destruction time.
+        Covered by no longer crashing tests.
+
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        (WebKit::NetworkProcessConnection::removeSWClientConnection):
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Storage/WebSWClientConnection.cpp:
+        (WebKit::WebSWClientConnection::~WebSWClientConnection):
+
 2019-05-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp

@@ -266 +266 @@
 }
 
+void NetworkProcessConnection::removeSWClientConnection(WebSWClientConnection& connection)
+{
+    ASSERT(m_swConnectionsByIdentifier.contains(connection.serverConnectionIdentifier()));
+    m_swConnectionsByIdentifier.remove(connection.serverConnectionIdentifier());
+}
+
 SWServerConnectionIdentifier NetworkProcessConnection::initializeSWClientConnection(WebSWClientConnection& connection)
 {

trunk/Source/WebKit/WebProcess/Network/NetworkProcessConnection.h

@@ -78 +78 @@
 
     WebCore::SWServerConnectionIdentifier initializeSWClientConnection(WebSWClientConnection&);
+    void removeSWClientConnection(WebSWClientConnection&);
 #endif
 

trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp

@@ -63 +63 @@
 WebSWClientConnection::~WebSWClientConnection()
 {
+    if (m_connection)
+        WebProcess::singleton().ensureNetworkProcessConnection().removeSWClientConnection(*this);
 }