<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194160] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194160">194160</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-16 10:43:54 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Combine handling open requests, delete requests, and transactions into one timer.
https://bugs.webkit.org/show_bug.cgi?id=152344
Reviewed by Alex Christensen.
No new tests (Refactor, existing tests pass).
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::invokeOperationAndTransactionTimer):
(WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
(WebCore::IDBServer::UniqueIDBDatabase::didPerformActivateTransactionInBackingStore):
(WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted):
(WebCore::IDBServer::UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer): Deleted.
(WebCore::IDBServer::UniqueIDBDatabase::deleteOrRunTransactionsTimerFired): Deleted.
* Modules/indexeddb/server/UniqueIDBDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194159 => 194160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-16 18:38:26 UTC (rev 194159)
+++ trunk/Source/WebCore/ChangeLog 2015-12-16 18:43:54 UTC (rev 194160)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-16 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Combine handling open requests, delete requests, and transactions into one timer.
+ https://bugs.webkit.org/show_bug.cgi?id=152344
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Refactor, existing tests pass).
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
+ (WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
+ (WebCore::IDBServer::UniqueIDBDatabase::invokeOperationAndTransactionTimer):
+ (WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
+ (WebCore::IDBServer::UniqueIDBDatabase::didPerformActivateTransactionInBackingStore):
+ (WebCore::IDBServer::UniqueIDBDatabase::inProgressTransactionCompleted):
+ (WebCore::IDBServer::UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer): Deleted.
+ (WebCore::IDBServer::UniqueIDBDatabase::deleteOrRunTransactionsTimerFired): Deleted.
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
</ins><span class="cx"> 2015-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix after r194156.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (194159 => 194160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-16 18:38:26 UTC (rev 194159)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2015-12-16 18:43:54 UTC (rev 194160)
</span><span class="lines">@@ -47,8 +47,7 @@
</span><span class="cx"> UniqueIDBDatabase::UniqueIDBDatabase(IDBServer& server, const IDBDatabaseIdentifier& identifier)
</span><span class="cx"> : m_server(server)
</span><span class="cx"> , m_identifier(identifier)
</span><del>- , m_deleteOrRunTransactionsTimer(*this, &UniqueIDBDatabase::deleteOrRunTransactionsTimerFired)
- , m_handleOpenDatabaseOperationsTimer(*this, &UniqueIDBDatabase::handleOpenDatabaseOperations)
</del><ins>+ , m_operationAndTransactionTimer(*this, &UniqueIDBDatabase::operationAndTransactionTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -793,8 +792,7 @@
</span><span class="cx"> m_versionChangeTransaction = nullptr;
</span><span class="cx"> m_versionChangeDatabaseConnection = nullptr;
</span><span class="cx">
</span><del>- if (!m_handleOpenDatabaseOperationsTimer.isActive())
- m_handleOpenDatabaseOperationsTimer.startOneShot(0);
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint64_t callbackID = storeCallback(callback);
</span><span class="lines">@@ -892,7 +890,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now that a database connection has closed, previously blocked operations might be runnable.
</span><del>- invokeDeleteOrRunTransactionTimer();
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::enqueueTransaction(Ref<UniqueIDBDatabaseTransaction>&& transaction)
</span><span class="lines">@@ -903,19 +901,21 @@
</span><span class="cx">
</span><span class="cx"> m_pendingTransactions.append(WTF::move(transaction));
</span><span class="cx">
</span><del>- invokeDeleteOrRunTransactionTimer();
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::invokeDeleteOrRunTransactionTimer()
</del><ins>+void UniqueIDBDatabase::invokeOperationAndTransactionTimer()
</ins><span class="cx"> {
</span><del>- if (!m_deleteOrRunTransactionsTimer.isActive())
- m_deleteOrRunTransactionsTimer.startOneShot(0);
</del><ins>+ if (!m_operationAndTransactionTimer.isActive())
+ m_operationAndTransactionTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::deleteOrRunTransactionsTimerFired()
</del><ins>+void UniqueIDBDatabase::operationAndTransactionTimerFired()
</ins><span class="cx"> {
</span><del>- LOG(IndexedDB, "(main) UniqueIDBDatabase::deleteOrRunTransactionsTimerFired");
</del><ins>+ LOG(IndexedDB, "(main) UniqueIDBDatabase::operationAndTransactionTimerFired");
</ins><span class="cx">
</span><ins>+ handleOpenDatabaseOperations();
+
</ins><span class="cx"> if (m_deletePending && maybeDeleteDatabase(nullptr))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx">
</span><span class="cx"> // If no transactions were deferred, it's possible we can start another transaction right now.
</span><span class="cx"> if (!hadDeferredTransactions)
</span><del>- invokeDeleteOrRunTransactionTimer();
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "(main) UniqueIDBDatabase::didPerformActivateTransactionInBackingStore");
</span><span class="cx">
</span><del>- invokeDeleteOrRunTransactionTimer();
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx">
</span><span class="cx"> performErrorCallback(callbackIdentifier, error);
</span><span class="cx"> }
</span><span class="lines">@@ -1046,7 +1046,7 @@
</span><span class="cx"> m_closePendingDatabaseConnections.remove(&transaction->databaseConnection());
</span><span class="cx">
</span><span class="cx"> // Previously blocked operations might be runnable.
</span><del>- invokeDeleteOrRunTransactionTimer();
</del><ins>+ invokeOperationAndTransactionTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::performErrorCallback(uint64_t callbackIdentifier, const IDBError& error)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (194159 => 194160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-16 18:38:26 UTC (rev 194159)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2015-12-16 18:43:54 UTC (rev 194160)
</span><span class="lines">@@ -164,8 +164,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasAnyPendingCallbacks() const;
</span><span class="cx">
</span><del>- void invokeDeleteOrRunTransactionTimer();
- void deleteOrRunTransactionsTimerFired();
</del><ins>+ void invokeOperationAndTransactionTimer();
+ void operationAndTransactionTimerFired();
</ins><span class="cx"> RefPtr<UniqueIDBDatabaseTransaction> takeNextRunnableTransaction(bool& hadDeferredTransactions);
</span><span class="cx">
</span><span class="cx"> IDBServer& m_server;
</span><span class="lines">@@ -190,8 +190,7 @@
</span><span class="cx"> HashMap<uint64_t, GetResultCallback> m_getResultCallbacks;
</span><span class="cx"> HashMap<uint64_t, CountCallback> m_countCallbacks;
</span><span class="cx">
</span><del>- Timer m_deleteOrRunTransactionsTimer;
- Timer m_handleOpenDatabaseOperationsTimer;
</del><ins>+ Timer m_operationAndTransactionTimer;
</ins><span class="cx">
</span><span class="cx"> Deque<RefPtr<UniqueIDBDatabaseTransaction>> m_pendingTransactions;
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<UniqueIDBDatabaseTransaction>> m_inProgressTransactions;
</span></span></pre>
</div>
</div>
</body>
</html>