Changeset 278179 in webkit

Timestamp:

May 27, 2021, 2:55:40 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Abandon pending tasks on background thread when WebIDBServer is closed
​https://bugs.webkit.org/show_bug.cgi?id=226295

Reviewed by Chris Dumez.

Source/WebCore:

• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Disable threading check as we may

abort transactions on the main thread.
(WebCore::IDBServer::SQLiteIDBBackingStore::getOrEstablishDatabaseInfo):

Source/WebKit:

When WebIDBServer is closed, it means there is no open connection to client, so we don't need to handle pending
tasks. We can ditch them by killing the CrossThreadQueue. For ongoing task, it can be blocked on quota check, so
let's just stop database activities on the main thread to make sure database lock is released.

• NetworkProcess/IndexedDB/WebIDBServer.cpp:

(WebKit::WebIDBServer::close):

• NetworkProcess/IndexedDB/WebIDBServer.h:

Source/WTF:

Make the wait end with either a new message or queue being killed.

• wtf/CrossThreadQueue.h:

(WTF::CrossThreadQueue<DataType>::waitForMessage):

• wtf/CrossThreadTask.h:

(WTF::CrossThreadTask::operator bool const):

• wtf/CrossThreadTaskHandler.cpp:

(WTF::CrossThreadTaskHandler::taskRunLoop):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/CrossThreadQueue.h (modified) (1 diff)
• WTF/wtf/CrossThreadTask.h (modified) (1 diff)
• WTF/wtf/CrossThreadTaskHandler.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (modified) (1 diff)
• WebKit/NetworkProcess/IndexedDB/WebIDBServer.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-27  Sihui Liu  <sihui_liu@apple.com>
+
+        Abandon pending tasks on background thread when WebIDBServer is closed
+        https://bugs.webkit.org/show_bug.cgi?id=226295
+
+        Reviewed by Chris Dumez.
+
+        Make the wait end with either a new message or queue being killed.
+
+        * wtf/CrossThreadQueue.h:
+        (WTF::CrossThreadQueue<DataType>::waitForMessage):
+        * wtf/CrossThreadTask.h:
+        (WTF::CrossThreadTask::operator bool const):
+        * wtf/CrossThreadTaskHandler.cpp:
+        (WTF::CrossThreadTaskHandler::taskRunLoop):
+
 2021-05-27  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WTF/wtf/CrossThreadQueue.h

@@ -74 +74 @@
 
     auto found = m_queue.end();
-    while (found == m_queue.end()) {
+    while (!m_killed && found == m_queue.end()) {
         found = m_queue.begin();
         if (found != m_queue.end())

trunk/Source/WTF/wtf/CrossThreadTask.h

@@ -49 +49 @@
         m_taskFunction();
     }
+
+    explicit operator bool() const { return !!m_taskFunction; }
 
 protected:

trunk/Source/WTF/wtf/CrossThreadTaskHandler.cpp

@@ -75 +75 @@
     }
 
-    while (!m_taskQueue.isKilled()) {
+    while (auto task = m_taskQueue.waitForMessage()) {
         std::unique_ptr<AutodrainedPool> autodrainedPool = (m_useAutodrainedPool == AutodrainedPoolForRunLoop::Use) ? makeUnique<AutodrainedPool>() : nullptr;
 
-        m_taskQueue.waitForMessage().performTask();
+        task.performTask();
     }
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-27  Sihui Liu  <sihui_liu@apple.com>
+
+        Abandon pending tasks on background thread when WebIDBServer is closed
+        https://bugs.webkit.org/show_bug.cgi?id=226295
+
+        Reviewed by Chris Dumez.
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp: Disable threading check as we may
+        abort transactions on the main thread.
+        (WebCore::IDBServer::SQLiteIDBBackingStore::getOrEstablishDatabaseInfo):
+
 2021-05-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -1005 +1005 @@
         return IDBError { UnknownError, "Unable to open database file on disk"_s };
 
+    m_sqliteDB->disableThreadingChecks();
     m_sqliteDB->enableAutomaticWALTruncation();
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-27  Sihui Liu  <sihui_liu@apple.com>
+
+        Abandon pending tasks on background thread when WebIDBServer is closed
+        https://bugs.webkit.org/show_bug.cgi?id=226295
+
+        Reviewed by Chris Dumez.
+
+        When WebIDBServer is closed, it means there is no open connection to client, so we don't need to handle pending
+        tasks. We can ditch them by killing the CrossThreadQueue. For ongoing task, it can be blocked on quota check, so
+        let's just stop database activities on the main thread to make sure database lock is released.
+
+        * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+        (WebKit::WebIDBServer::close):
+        * NetworkProcess/IndexedDB/WebIDBServer.h:
+
 2021-05-27  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -416 +416 @@
         connection->removeThreadMessageReceiver(Messages::WebIDBServer::messageReceiverName());
 
-    CrossThreadTaskHandler::setCompletionCallback([protectedThis = makeRef(*this)]() mutable {
-        ASSERT(!RunLoop::isMain());
-        callOnMainRunLoop([protectedThis = WTFMove(protectedThis)]() mutable { });
-    });
-
-    postTask([this]() mutable {
+    CrossThreadTaskHandler::setCompletionCallback([this, protectedThis = makeRef(*this)]() mutable {
+        ASSERT(!RunLoop::isMain());
+
         m_connectionMap.clear();
-
         Locker locker { m_serverLock };
         m_server = nullptr;
-        CrossThreadTaskHandler::kill();
-    });
+
+        callOnMainRunLoop([protectedThis = WTFMove(protectedThis)] { });
+    });
+
+    {
+        Locker locker { m_serverLock };
+        if (m_server)
+            m_server->stopDatabaseActivitiesOnMainThread();
+    }
+
+    CrossThreadTaskHandler::kill();
 
     m_closeCallback();

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

@@ -99 +99 @@
 
     Lock m_serverLock;
-    std::unique_ptr<WebCore::IDBServer::IDBServer> m_server;
+    std::unique_ptr<WebCore::IDBServer::IDBServer> m_server WTF_GUARDED_BY_LOCK(m_serverLock);
     bool m_isSuspended { false };