Changeset 278317 in webkit

Timestamp:

Jun 1, 2021, 11:57:43 AM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Resume WebIDBServer when it is about to be closed
​https://bugs.webkit.org/show_bug.cgi?id=226502
rdar://78691498

Reviewed by Chris Dumez.

We started to acquire m_serverLock in WebIDBServer::close() in r278179 to stop database activities on the main
thread. However, m_serverLock may already be held for suspension, and WebIDBServer::close() may be called
before resume(). We need to resume WebIDBServer so m_serverLock can be acquired for stopping database activities.
This also makes sure background thread is resumed before WebIDBServer is removed from NetworkProcess.

• NetworkProcess/IndexedDB/WebIDBServer.cpp:

(WebKit::WebIDBServer::~WebIDBServer):
(WebKit::WebIDBServer::close):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/IndexedDB/WebIDBServer.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-01  Sihui Liu  <sihui_liu@apple.com>
+
+        Resume WebIDBServer when it is about to be closed
+        https://bugs.webkit.org/show_bug.cgi?id=226502
+        rdar://78691498
+
+        Reviewed by Chris Dumez.
+
+        We started to acquire m_serverLock in WebIDBServer::close() in r278179 to stop database activities on the main
+        thread. However, m_serverLock may already be held for suspension, and WebIDBServer::close() may be called 
+        before resume(). We need to resume WebIDBServer so m_serverLock can be acquired for stopping database activities.
+        This also makes sure background thread is resumed before WebIDBServer is removed from NetworkProcess.
+
+        * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+        (WebKit::WebIDBServer::~WebIDBServer):
+        (WebKit::WebIDBServer::close):
+
 2021-06-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp

@@ -59 +59 @@
     // close() has to be called to make sure thread exits.
     ASSERT(!m_closeCallback);
+    ASSERT(!m_isSuspended);
 }
 
@@ -428 +429 @@
     });
 
+#if PLATFORM(IOS_FAMILY)
+    // Network process may become active and close WebIDBServer before receiving resume message.
+    resume();
+#endif
+
     {
         Locker locker { m_serverLock };