<!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>[204359] 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/204359">204359</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-10 15:37:47 -0700 (Wed, 10 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert back to the old style member function state machine for callbacks
https://bugs.webkit.org/show_bug.cgi?id=160756
Reviewed by Tim Horton.
This is another step towards merging SQLTransactionBackend and SQLTransaction,
and using a single state machine for both sides.
* Modules/webdatabase/SQLTransaction.cpp:
(WebCore::SQLTransaction::SQLTransaction):
(WebCore::SQLTransaction::performPendingCallback):
(WebCore::SQLTransaction::checkAndHandleClosedDatabase):
(WebCore::SQLTransaction::scheduleCallback):
(WebCore::SQLTransaction::openTransactionAndPreflight):
(WebCore::SQLTransaction::runCurrentStatement):
(WebCore::SQLTransaction::handleCurrentStatementError):
(WebCore::SQLTransaction::handleTransactionError):
(WebCore::SQLTransaction::postflightAndCommit):
(WebCore::SQLTransaction::debugStepName):
* Modules/webdatabase/SQLTransaction.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLTransactionh">trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204358 => 204359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-10 22:32:48 UTC (rev 204358)
+++ trunk/Source/WebCore/ChangeLog 2016-08-10 22:37:47 UTC (rev 204359)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-08-10 Anders Carlsson <andersca@apple.com>
+
+ Revert back to the old style member function state machine for callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=160756
+
+ Reviewed by Tim Horton.
+
+ This is another step towards merging SQLTransactionBackend and SQLTransaction,
+ and using a single state machine for both sides.
+
+ * Modules/webdatabase/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::SQLTransaction):
+ (WebCore::SQLTransaction::performPendingCallback):
+ (WebCore::SQLTransaction::checkAndHandleClosedDatabase):
+ (WebCore::SQLTransaction::scheduleCallback):
+ (WebCore::SQLTransaction::openTransactionAndPreflight):
+ (WebCore::SQLTransaction::runCurrentStatement):
+ (WebCore::SQLTransaction::handleCurrentStatementError):
+ (WebCore::SQLTransaction::handleTransactionError):
+ (WebCore::SQLTransaction::postflightAndCommit):
+ (WebCore::SQLTransaction::debugStepName):
+ * Modules/webdatabase/SQLTransaction.h:
+
</ins><span class="cx"> 2016-08-09 Skachkov Oleksandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES2016] Implement Object.values
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp (204358 => 204359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2016-08-10 22:32:48 UTC (rev 204358)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.cpp 2016-08-10 22:37:47 UTC (rev 204359)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Database.h"
</span><span class="cx"> #include "DatabaseAuthorizer.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><ins>+#include "DatabaseThread.h"
</ins><span class="cx"> #include "DatabaseTracker.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> , m_successCallbackWrapper(WTFMove(successCallback), m_database->scriptExecutionContext())
</span><span class="cx"> , m_errorCallbackWrapper(WTFMove(errorCallback), m_database->scriptExecutionContext())
</span><span class="cx"> , m_wrapper(WTFMove(wrapper))
</span><ins>+ , m_nextStep(&SQLTransaction::acquireLock)
</ins><span class="cx"> , m_executeSqlAllowed(false)
</span><span class="cx"> , m_shouldRetryCurrentStatement(false)
</span><span class="cx"> , m_modifiedDatabase(false)
</span><span class="lines">@@ -114,8 +116,18 @@
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::performPendingCallback()
</span><span class="cx"> {
</span><del>- computeNextStateAndCleanupIfNeeded();
- runStateMachine();
</del><ins>+ LOG(StorageAPI, "Callback %s\n", debugStepName(m_nextStep));
+
+ ASSERT(m_nextStep == &SQLTransaction::deliverTransactionCallback
+ || m_nextStep == &SQLTransaction::deliverTransactionErrorCallback
+ || m_nextStep == &SQLTransaction::deliverStatementCallback
+ || m_nextStep == &SQLTransaction::deliverQuotaIncreaseCallback
+ || m_nextStep == &SQLTransaction::deliverSuccessCallback);
+
+ checkAndHandleClosedDatabase();
+
+ if (m_nextStep)
+ (this->*m_nextStep)();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::notifyDatabaseThreadIsShuttingDown()
</span><span class="lines">@@ -163,6 +175,45 @@
</span><span class="cx"> m_database->scheduleTransactionCallback(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SQLTransaction::checkAndHandleClosedDatabase()
+{
+ if (m_database->opened())
+ return;
+
+ // If the database was stopped, don't do anything and cancel queued work
+ LOG(StorageAPI, "Database was stopped or interrupted - cancelling work for this transaction");
+
+ LockHolder locker(m_statementMutex);
+ m_statementQueue.clear();
+ m_nextStep = nullptr;
+
+ // Release the unneeded callbacks, to break reference cycles.
+ m_callbackWrapper.clear();
+ m_successCallbackWrapper.clear();
+ m_errorCallbackWrapper.clear();
+
+ // The next steps should be executed only if we're on the DB thread.
+ if (currentThread() != m_database->databaseContext()->databaseThread()->getThreadID())
+ return;
+
+ // The current SQLite transaction should be stopped, as well
+ if (m_sqliteTransaction) {
+ m_sqliteTransaction->stop();
+ m_sqliteTransaction = nullptr;
+ }
+
+ if (m_lockAcquired)
+ m_database->transactionCoordinator()->releaseLock(*this);
+}
+
+void SQLTransaction::scheduleCallback(void (SQLTransaction::*step)())
+{
+ m_nextStep = step;
+
+ LOG(StorageAPI, "Scheduling %s for transaction %p\n", debugStepName(step), this);
+ m_database->scheduleTransactionCallback(this);
+}
+
</ins><span class="cx"> void SQLTransaction::acquireLock()
</span><span class="cx"> {
</span><span class="cx"> m_database->transactionCoordinator()->acquireLock(*this);
</span><span class="lines">@@ -238,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.4: Invoke the transaction callback with the new SQLTransaction object
</span><span class="cx"> if (m_callbackWrapper.hasCallback()) {
</span><del>- requestTransitToState(SQLTransactionState::DeliverTransactionCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverTransactionCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -469,7 +520,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_currentStatement->hasStatementCallback()) {
</span><del>- requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverStatementCallback);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -479,7 +530,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_currentStatement->lastExecutionFailedDueToQuota()) {
</span><del>- requestTransitToState(SQLTransactionState::DeliverQuotaIncreaseCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverQuotaIncreaseCallback);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -492,7 +543,7 @@
</span><span class="cx"> // Spec 4.3.2.6.6: error - Call the statement's error callback, but if there was no error callback,
</span><span class="cx"> // or the transaction was rolled back, jump to the transaction error callback
</span><span class="cx"> if (m_currentStatement->hasStatementErrorCallback() && !m_sqliteTransaction->wasRolledBackBySqlite()) {
</span><del>- requestTransitToState(SQLTransactionState::DeliverStatementCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverStatementCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -507,7 +558,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_transactionError);
</span><span class="cx"> if (m_errorCallbackWrapper.hasCallback()) {
</span><del>- requestTransitToState(SQLTransactionState::DeliverTransactionErrorCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverTransactionErrorCallback);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -558,7 +609,7 @@
</span><span class="cx"> m_database->transactionClient()->didCommitWriteTransaction(m_database.ptr());
</span><span class="cx">
</span><span class="cx"> // Spec 4.3.2.8: Deliver success callback, if there is one.
</span><del>- requestTransitToState(SQLTransactionState::DeliverSuccessCallback);
</del><ins>+ scheduleCallback(&SQLTransaction::deliverSuccessCallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLTransaction::acquireOriginLock()
</span><span class="lines">@@ -576,4 +627,33 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+const char* SQLTransaction::debugStepName(void (SQLTransaction::*step)())
+{
+ if (step == &SQLTransaction::acquireLock)
+ return "acquireLock";
+ if (step == &SQLTransaction::openTransactionAndPreflight)
+ return "openTransactionAndPreflight";
+ if (step == &SQLTransaction::runStatements)
+ return "runStatements";
+ if (step == &SQLTransaction::postflightAndCommit)
+ return "postflightAndCommit";
+ if (step == &SQLTransaction::cleanupAfterTransactionErrorCallback)
+ return "cleanupAfterTransactionErrorCallback";
+ if (step == &SQLTransaction::deliverTransactionCallback)
+ return "deliverTransactionCallback";
+ if (step == &SQLTransaction::deliverTransactionErrorCallback)
+ return "deliverTransactionErrorCallback";
+ if (step == &SQLTransaction::deliverStatementCallback)
+ return "deliverStatementCallback";
+ if (step == &SQLTransaction::deliverQuotaIncreaseCallback)
+ return "deliverQuotaIncreaseCallback";
+ if (step == &SQLTransaction::deliverSuccessCallback)
+ return "deliverSuccessCallback";
+
+ ASSERT_NOT_REACHED();
+ return "UNKNOWN";
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h (204358 => 204359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2016-08-10 22:32:48 UTC (rev 204358)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransaction.h 2016-08-10 22:37:47 UTC (rev 204359)
</span><span class="lines">@@ -82,8 +82,12 @@
</span><span class="cx">
</span><span class="cx"> void enqueueStatement(std::unique_ptr<SQLStatement>);
</span><span class="cx">
</span><ins>+ void checkAndHandleClosedDatabase();
+
</ins><span class="cx"> void clearCallbackWrappers();
</span><span class="cx">
</span><ins>+ void scheduleCallback(void (SQLTransaction::*)());
+
</ins><span class="cx"> // State Machine functions:
</span><span class="cx"> StateFunction stateFunctionFor(SQLTransactionState) override;
</span><span class="cx"> void computeNextStateAndCleanupIfNeeded();
</span><span class="lines">@@ -111,6 +115,10 @@
</span><span class="cx"> void acquireOriginLock();
</span><span class="cx"> void releaseOriginLockIfNeeded();
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+ static const char* debugStepName(void (SQLTransaction::*)());
+#endif
+
</ins><span class="cx"> Ref<Database> m_database;
</span><span class="cx"> SQLCallbackWrapper<SQLTransactionCallback> m_callbackWrapper;
</span><span class="cx"> SQLCallbackWrapper<VoidCallback> m_successCallbackWrapper;
</span><span class="lines">@@ -118,6 +126,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SQLTransactionWrapper> m_wrapper;
</span><span class="cx">
</span><ins>+ void (SQLTransaction::*m_nextStep)();
+
</ins><span class="cx"> bool m_executeSqlAllowed;
</span><span class="cx"> RefPtr<SQLError> m_transactionError;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>