Bug 1598164 - Fixed log messages, use serial number of transaction. r=#dom-workers-and-storage draft
authorSimon Giesecke <sgiesecke@mozilla.com>
Wed, 04 Dec 2019 12:47:10 +0000
changeset 2514396 84d9fd852b4bff59816eaf897284aaffed417db5
parent 2513214 3c08edf74d039af79f9daad8ff5b57ffb64fdab6
child 2514397 fa83d31a5d26688962cd72a0f39627073a9305c5
push id459906
push userreviewbot
push dateWed, 04 Dec 2019 12:47:31 +0000
treeherdertry@fa83d31a5d26 [default view] [failures only]
bugs1598164
milestone73.0a1
Bug 1598164 - Fixed log messages, use serial number of transaction. r=#dom-workers-and-storage Differential Revision: https://phabricator.services.mozilla.com/D54963 Differential Diff: PHID-DIFF-oxrguktah2wcrmvk6vqh
dom/indexedDB/ActorsParent.cpp
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -13627,17 +13627,17 @@ mozilla::ipc::IPCResult Database::RecvCl
 
 void Database::StartTransactionOp::RunOnConnectionThread() {
   MOZ_ASSERT(!IsOnBackgroundThread());
   MOZ_ASSERT(Transaction());
   MOZ_ASSERT(NS_SUCCEEDED(mResultCode));
 
   IDB_LOG_MARK_PARENT_TRANSACTION("Beginning database work", "DB Start",
                                   IDB_LOG_ID_STRING(mBackgroundChildLoggingId),
-                                  mLoggingSerialNumber);
+                                  mTransactionLoggingSerialNumber);
 
   TransactionDatabaseOperationBase::RunOnConnectionThread();
 }
 
 nsresult Database::StartTransactionOp::DoDatabaseWork(
     DatabaseConnection* aConnection) {
   MOZ_ASSERT(aConnection);
   aConnection->AssertIsOnConnectionThread();
@@ -21611,17 +21611,17 @@ nsresult OpenDatabaseOp::VersionChangeOp
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
 
   AUTO_PROFILER_LABEL("OpenDatabaseOp::VersionChangeOp::DoDatabaseWork", DOM);
 
   IDB_LOG_MARK_PARENT_TRANSACTION("Beginning database work", "DB Start",
                                   IDB_LOG_ID_STRING(mBackgroundChildLoggingId),
-                                  mLoggingSerialNumber);
+                                  mTransactionLoggingSerialNumber);
 
   Transaction()->SetActiveOnConnectionThread();
 
   nsresult rv = aConnection->BeginWriteTransaction();
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
@@ -22632,17 +22632,17 @@ TransactionBase::CommitOp::Run() {
 
   IDB_LOG_MARK_PARENT_TRANSACTION_REQUEST(
       "Finished database work", "DB End",
       IDB_LOG_ID_STRING(mBackgroundChildLoggingId),
       mTransaction->LoggingSerialNumber(), mLoggingSerialNumber);
 
   IDB_LOG_MARK_PARENT_TRANSACTION("Finished database work", "DB End",
                                   IDB_LOG_ID_STRING(mBackgroundChildLoggingId),
-                                  mLoggingSerialNumber);
+                                  mTransaction->LoggingSerialNumber());
 
   return NS_OK;
 }
 
 void TransactionBase::CommitOp::TransactionFinishedBeforeUnblock() {
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(mTransaction);