Changeset 29876 in webkit

Timestamp:

Jan 30, 2008 2:26:09 PM (16 years ago)

Author:

timothy@apple.com

Message:

Reviewed by Darin Adler.

<rdar://problem/5688428> Reproducible assertion failure in SQLTransaction::performNextStep() (16876)

Revised fix to use the globalCallbackMutex() mutex and hold the mutex
for the entire function scope.

• storage/Database.cpp: (WebCore::Database::performTransactionStep):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/Database.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-30  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/5688428> Reproducible assertion failure in SQLTransaction::performNextStep() (16876)
+
+        Revised fix to use the globalCallbackMutex() mutex and hold the mutex
+        for the entire function scope.
+
+        * storage/Database.cpp:
+        (WebCore::Database::performTransactionStep):
+
 2008-01-30  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/storage/Database.cpp

@@ -404 +404 @@
 void Database::performTransactionStep()
 {
-    // Do not perform transaction if a callback is scheduled
-    {
-        MutexLocker locker(m_callbackMutex);
-        if (s_globalCallbackScheduled)
-            return;
-    }
-    
+    // Do not perform a transaction if a global callback is scheduled.
+    MutexLocker locker(globalCallbackMutex());
+    if (s_globalCallbackScheduled)
+        return;
+
     {
         MutexLocker locker(m_transactionMutex);
-        
+
         if (!m_currentTransaction) {
             ASSERT(m_transactionQueue.size());
@@ -420 +418 @@
         }
     }
-    
+
     // If this step completes the entire transaction, clear the working transaction
     // and schedule the next one if necessary
     if (!m_currentTransaction->performNextStep())
         return;
-        
+
     {
         MutexLocker locker(m_transactionMutex);
         m_currentTransaction = 0;
-        
+
         if (m_transactionQueue.size())
             m_databaseThread->scheduleTask(this, new DatabaseTransactionTask);