Changeset 250732 in webkit

Timestamp:

Oct 4, 2019 11:26:19 AM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Layout Test imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception.html is a Flaky Failure
​https://bugs.webkit.org/show_bug.cgi?id=201481
<rdar://problem/55046055>

Reviewed by Alex Christensen.

We should not schedule timer if we know the timer function will be no-op.

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::removeRequest):
(WebCore::IDBTransaction::scheduleOperation):
(WebCore::IDBTransaction::trySchedulePendingOperationTimer):
(WebCore::IDBTransaction::pendingOperationTimerFired):
(WebCore::IDBTransaction::didStart):
(WebCore::IDBTransaction::operationCompletedOnClient):
(WebCore::IDBTransaction::deactivate):
(WebCore::IDBTransaction::schedulePendingOperationTimer): Deleted.

• Modules/indexeddb/IDBTransaction.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBTransaction.cpp (modified) (6 diffs)
• Modules/indexeddb/IDBTransaction.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-04  Sihui Liu  <sihui_liu@apple.com>
+
+        Layout Test imported/w3c/web-platform-tests/IndexedDB/fire-error-event-exception.html is a Flaky Failure
+        https://bugs.webkit.org/show_bug.cgi?id=201481
+        <rdar://problem/55046055>
+
+        Reviewed by Alex Christensen.
+
+        We should not schedule timer if we know the timer function will be no-op.
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::removeRequest):
+        (WebCore::IDBTransaction::scheduleOperation):
+        (WebCore::IDBTransaction::trySchedulePendingOperationTimer):
+        (WebCore::IDBTransaction::pendingOperationTimerFired):
+        (WebCore::IDBTransaction::didStart):
+        (WebCore::IDBTransaction::operationCompletedOnClient):
+        (WebCore::IDBTransaction::deactivate):
+        (WebCore::IDBTransaction::schedulePendingOperationTimer): Deleted.
+        * Modules/indexeddb/IDBTransaction.h:
+
 2019-10-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -384 +384 @@
     ASSERT(&m_database->originThread() == &Thread::current());
     m_openRequests.remove(&request);
+
+    trySchedulePendingOperationTimer();
 }
 
@@ -395 +397 @@
     m_transactionOperationMap.set(identifier, WTFMove(operation));
 
-    schedulePendingOperationTimer();
-}
-
-void IDBTransaction::schedulePendingOperationTimer()
-{
-    ASSERT(&m_database->originThread() == &Thread::current());
-
-    if (!m_pendingOperationTimer.isActive())
-        m_pendingOperationTimer.startOneShot(0_s);
-}
-
-void IDBTransaction::pendingOperationTimerFired()
-{
-    LOG(IndexedDB, "IDBTransaction::pendingOperationTimerFired (%p)", this);
+    trySchedulePendingOperationTimer();
+}
+
+void IDBTransaction::trySchedulePendingOperationTimer()
+{
     ASSERT(&m_database->originThread() == &Thread::current());
 
@@ -418 +411 @@
     if (!m_transactionOperationsInProgressQueue.isEmpty() && !m_transactionOperationsInProgressQueue.last()->nextRequestCanGoToServer())
         return;
+
+    if (m_pendingTransactionOperationQueue.isEmpty() && (!m_transactionOperationMap.isEmpty() || !m_openRequests.isEmpty() || isFinishedOrFinishing()))
+        return;
+
+    if (!m_pendingOperationTimer.isActive())
+        m_pendingOperationTimer.startOneShot(0_s);
+}
+
+void IDBTransaction::pendingOperationTimerFired()
+{
+    LOG(IndexedDB, "IDBTransaction::pendingOperationTimerFired (%p)", this);
+    ASSERT(&m_database->originThread() == &Thread::current());
 
     // We want to batch operations together without spinning the runloop for performance,
@@ -558 +563 @@
     }
 
-    schedulePendingOperationTimer();
+    trySchedulePendingOperationTimer();
 }
 
@@ -1411 +1416 @@
     m_transactionOperationsInProgressQueue.removeFirst();
 
-    schedulePendingOperationTimer();
+    trySchedulePendingOperationTimer();
 }
 
@@ -1439 +1444 @@
         m_state = IndexedDB::TransactionState::Inactive;
 
-    schedulePendingOperationTimer();
+    trySchedulePendingOperationTimer();
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h

@@ -230 +230 @@
     void completeCursorRequest(IDBRequest&, const IDBResultData&);
 
-    void schedulePendingOperationTimer();
+    void trySchedulePendingOperationTimer();
     void scheduleCompletedOperationTimer();