Changeset 242983 in webkit

Timestamp:

Mar 14, 2019, 6:54:22 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

Web process is put to suspended when holding locked WebSQL files
​https://bugs.webkit.org/show_bug.cgi?id=195768

Reviewed by Geoffrey Garen.

We need to keep processes active during database close, because SQLite database may run a checkpoint operation
and lock database files.

• platform/sql/SQLiteDatabase.cpp:

(WebCore::SQLiteDatabase::useWALJournalMode):
(WebCore::SQLiteDatabase::close):

• platform/sql/SQLiteDatabase.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/SQLiteDatabase.cpp (modified) (4 diffs)
• platform/sql/SQLiteDatabase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-14  Sihui Liu  <sihui_liu@apple.com>
+
+        Web process is put to suspended when holding locked WebSQL files
+        https://bugs.webkit.org/show_bug.cgi?id=195768
+
+        Reviewed by Geoffrey Garen.
+
+        We need to keep processes active during database close, because SQLite database may run a checkpoint operation
+        and lock database files.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::useWALJournalMode):
+        (WebCore::SQLiteDatabase::close):
+        * platform/sql/SQLiteDatabase.h:
+
 2019-03-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp

@@ -31 +31 @@
 #include "Logging.h"
 #include "MemoryRelease.h"
+#include "SQLiteDatabaseTracker.h"
 #include "SQLiteFileSystem.h"
 #include "SQLiteStatement.h"
@@ -134 +135 @@
 void SQLiteDatabase::useWALJournalMode()
 {
+    m_useWAL = true;
     {
         SQLiteStatement walStatement(*this, "PRAGMA journal_mode=WAL;"_s);
@@ -147 +149 @@
 
     {
+        SQLiteTransactionInProgressAutoCounter transactionCounter;
         SQLiteStatement checkpointStatement(*this, "PRAGMA wal_checkpoint(TRUNCATE)"_s);
         if (checkpointStatement.prepareAndStep() == SQLITE_ROW) {
@@ -166 +169 @@
             m_db = 0;
         }
-        sqlite3_close(db);
+        if (m_useWAL) {
+            SQLiteTransactionInProgressAutoCounter transactionCounter;
+            sqlite3_close(db);
+        } else
+            sqlite3_close(db);
     }
 

trunk/Source/WebCore/platform/sql/SQLiteDatabase.h

@@ -156 +156 @@
     bool m_sharable { false };
 #endif
-    
+
+    bool m_useWAL { false };
+
     Lock m_authorizerLock;
     RefPtr<DatabaseAuthorizer> m_authorizer;