Changeset 54162 in webkit

Timestamp:

Feb 1, 2010 3:32:44 PM (14 years ago)

Author:

dumi@chromium.org

Message:

Making sure that all in-progress transactions are rolled back on
the database thread before they're destroyed. Otherwise,
SQLiteTransaction's destructor will try to do a rollback and that
would cause an assertion failure, if the object is not destroyed
on the DB thread.

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=34152

• platform/sql/SQLiteTransaction.cpp:

(WebCore::SQLiteTransaction::stop):

• storage/SQLTransaction.cpp:

(WebCore::SQLTransaction::notifyDatabaseThreadIsShuttingDown):

• storage/SQLTransaction.h:
• storage/SQLTransactionCoordinator.cpp:

(WebCore::SQLTransactionCoordinator::shutdown):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/SQLiteTransaction.cpp (modified) (2 diffs)
• storage/SQLTransaction.cpp (modified) (4 diffs)
• storage/SQLTransaction.h (modified) (1 diff)
• storage/SQLTransactionCoordinator.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-01  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Making sure that all in-progress transactions are rolled back on
+        the database thread before they're destroyed. Otherwise,
+        SQLiteTransaction's destructor will try to do a rollback and that
+        would cause an assertion failure, if the object is not destroyed
+        on the DB thread.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34152
+
+        * platform/sql/SQLiteTransaction.cpp:
+        (WebCore::SQLiteTransaction::stop):
+        * storage/SQLTransaction.cpp:
+        (WebCore::SQLTransaction::notifyDatabaseThreadIsShuttingDown):
+        * storage/SQLTransaction.h:
+        * storage/SQLTransactionCoordinator.cpp:
+        (WebCore::SQLTransactionCoordinator::shutdown):
+
 2010-02-01  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/platform/sql/SQLiteTransaction.cpp

@@ -65 +65 @@
 void SQLiteTransaction::commit()
 {
+    // FIXME: this code is buggy; it assumes that COMMIT always succeeds which is not the case:
+    // the transaction could've been silently rolled back before getting to the COMMIT statement
+    // (https://bugs.webkit.org/show_bug.cgi?id=34280). However, the rest of the code does not
+    // know how to deal with a premature rollback and a failed COMMIT at this moment, so until
+    // we figure out what to do with bug 34280, it's better to leave this code as it is.
     if (m_inProgress) {
         ASSERT(m_db.m_transactionInProgress);
@@ -85 +90 @@
 void SQLiteTransaction::stop()
 {
-    m_inProgress = false;
-    m_db.m_transactionInProgress = false;
+    if (m_inProgress) {
+        m_inProgress = false;
+        m_db.m_transactionInProgress = false;
+    }
 }
 

trunk/WebCore/storage/SQLTransaction.cpp

@@ -36 +36 @@
 #include "DatabaseAuthorizer.h"
 #include "DatabaseDetails.h"
+#include "DatabaseThread.h"
 #include "ExceptionCode.h"
 #include "Logging.h"
@@ -84 +85 @@
 SQLTransaction::~SQLTransaction()
 {
+    ASSERT(!m_sqliteTransaction);
 }
 
@@ -204 +206 @@
 }
 
+void SQLTransaction::notifyDatabaseThreadIsShuttingDown()
+{
+    ASSERT(currentThread() == database()->scriptExecutionContext()->databaseThread()->getThreadID());
+
+    // If the transaction is in progress, we should roll it back here, since this is our last
+    // oportunity to do something related to this transaction on the DB thread.
+    // Clearing m_sqliteTransaction invokes SQLiteTransaction's destructor which does just that.
+    m_sqliteTransaction.clear();
+}
+
 void SQLTransaction::acquireLock()
 {
@@ -492 +504 @@
     LOG(StorageAPI, "Transaction %p is complete\n", this);
     ASSERT(!m_database->m_sqliteDatabase.transactionInProgress());
+    m_sqliteTransaction.clear();
     m_nextStep = 0;
 

trunk/WebCore/storage/SQLTransaction.h

@@ -81 +81 @@
     Database* database() { return m_database.get(); }
     bool isReadOnly() { return m_readOnly; }
+    void notifyDatabaseThreadIsShuttingDown();
 
 private:

trunk/WebCore/storage/SQLTransactionCoordinator.cpp

@@ -110 +110 @@
 void SQLTransactionCoordinator::shutdown()
 {
+    // Notify all transactions in progress that the database thread is shutting down
+    for (CoordinationInfoMap::iterator coordinationInfoIterator = m_coordinationInfoMap.begin();
+         coordinationInfoIterator != m_coordinationInfoMap.end(); ++coordinationInfoIterator) {
+        CoordinationInfo& info = coordinationInfoIterator->second;
+        if (info.activeWriteTransaction)
+            info.activeWriteTransaction->notifyDatabaseThreadIsShuttingDown();
+        for (HashSet<RefPtr<SQLTransaction> >::iterator activeReadTransactionsIterator =
+                     info.activeReadTransactions.begin();
+             activeReadTransactionsIterator != info.activeReadTransactions.end();
+             ++activeReadTransactionsIterator) {
+            (*activeReadTransactionsIterator)->notifyDatabaseThreadIsShuttingDown();
+        }
+    }
+
     // Clean up all pending transactions for all databases
     m_coordinationInfoMap.clear();