Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1650076 - Fix bad printf format strings/argument lists. r=dom-workers-and-storage-reviewers,asuth

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D82016
This commit is contained in:
Simon Giesecke 2020-07-03 09:39:24 +00:00
parent 5d197908e3
commit c49d17f0db
9 changed files with 121 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dom/indexedDB/ActorsChild.cpp
View File

@ -529,14 +529,16 @@ void DispatchErrorEvent(
if (aTransaction) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"Firing %s event with error 0x%x", "%s (0x%x)",
"Firing %s event with error 0x%x", "%s (0x%" PRIx32 ")",
aTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(aEvent, kErrorEventType), aErrorCode);
IDB_LOG_STRINGIFY(aEvent, kErrorEventType),
static_cast<uint32_t>(aErrorCode));
} else {
IDB_LOG_MARK_CHILD_REQUEST("Firing %s event with error 0x%x", "%s (0x%x)",
IDB_LOG_MARK_CHILD_REQUEST("Firing %s event with error 0x%x",
"%s (0x%" PRIx32 ")",
request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(aEvent, kErrorEventType),
aErrorCode);
static_cast<uint32_t>(aErrorCode));
}
IgnoredErrorResult rv;
@ -2977,7 +2979,7 @@ void BackgroundCursorChild<CursorType>::SendContinueInternal(
if (discard) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Continue to key %s, discarding cached key %s/%s",
"Continue, discarding", transactionSerialNumber,
"Continue, discarding%.0s%.0s%.0s", transactionSerialNumber,
requestSerialNumber, key.GetBuffer().get(),
cachedSortKey.GetBuffer().get(),
currentCachedResponse.GetObjectStoreKeyForLogging());
@ -2985,7 +2987,7 @@ void BackgroundCursorChild<CursorType>::SendContinueInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Continue to key %s, keeping cached key %s/%s and "
"further",
"Continue, keeping", transactionSerialNumber,
"Continue, keeping%.0s%.0s%.0s", transactionSerialNumber,
requestSerialNumber, key.GetBuffer().get(),
cachedSortKey.GetBuffer().get(),
currentCachedResponse.GetObjectStoreKeyForLogging());
@ -3033,7 +3035,7 @@ void BackgroundCursorChild<CursorType>::SendContinueInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Continue to key %s with primary key %s, discarding "
"cached key %s with cached primary key %s",
"Continue, discarding", transactionSerialNumber,
"Continue, discarding%.0s%.0s%.0s%.0s", transactionSerialNumber,
requestSerialNumber, key.GetBuffer().get(),
primaryKey.GetBuffer().get(), cachedSortKey.GetBuffer().get(),
cachedSortPrimaryKey.GetBuffer().get());
@ -3041,7 +3043,7 @@ void BackgroundCursorChild<CursorType>::SendContinueInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Continue to key %s with primary key %s, keeping "
"cached key %s with cached primary key %s and further",
"Continue, keeping", transactionSerialNumber,
"Continue, keeping%.0s%.0s%.0s%.0s", transactionSerialNumber,
requestSerialNumber, key.GetBuffer().get(),
primaryKey.GetBuffer().get(), cachedSortKey.GetBuffer().get(),
cachedSortPrimaryKey.GetBuffer().get());
@ -3059,7 +3061,7 @@ void BackgroundCursorChild<CursorType>::SendContinueInternal(
case CursorRequestParams::TAdvanceParams: {
uint32_t& advanceCount = params.get_AdvanceParams().count();
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Advancing %" PRIu32 " records", "Advancing",
"PRELOAD: Advancing %" PRIu32 " records", "Advancing %" PRIu32,
mTransaction->LoggingSerialNumber(),
GetRequest()->LoggingSerialNumber(), advanceCount);
@ -3130,8 +3132,8 @@ void BackgroundCursorChild<CursorType>::CompleteContinueRequestFromCache() {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Consumed 1 cached response, %zu cached responses remaining",
"Consumed cached response", mTransaction->LoggingSerialNumber(),
GetRequest()->LoggingSerialNumber(),
"Consumed cached response, %zu remaining",
mTransaction->LoggingSerialNumber(), GetRequest()->LoggingSerialNumber(),
mDelayedResponses.size() + mCachedResponses.size());
SetResultAndDispatchSuccessEvent(
@ -3178,7 +3180,7 @@ void BackgroundCursorChild<CursorType>::InvalidateCachedResponses() {
// need to care, etc.
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Invalidating all %zu cached responses", "Invalidating",
"PRELOAD: Invalidating all %zu cached responses", "Invalidating %zu",
mTransaction->LoggingSerialNumber(), GetRequest()->LoggingSerialNumber(),
mCachedResponses.size());
@ -3210,9 +3212,10 @@ void BackgroundCursorChild<CursorType>::DiscardCachedResponses(
++discardedCount;
}
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Discarded %zu cached responses, %zu remaining", "Discarded",
mTransaction->LoggingSerialNumber(), GetRequest()->LoggingSerialNumber(),
discardedCount, mCachedResponses.size());
"PRELOAD: Discarded %zu cached responses, %zu remaining",
"Discarded %zu; remaining %zu", mTransaction->LoggingSerialNumber(),
GetRequest()->LoggingSerialNumber(), discardedCount,
mCachedResponses.size());
}
void BackgroundCursorChildBase::HandleResponse(nsresult aResponse) {
@ -3292,7 +3295,7 @@ void BackgroundCursorChild<CursorType>::HandleMultipleCursorResponses(
MOZ_ASSERT(aResponses.Length() > 0);
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Received %zu cursor responses", "Received",
"PRELOAD: Received %zu cursor responses", "Received %zu",
mTransaction->LoggingSerialNumber(), GetRequest()->LoggingSerialNumber(),
aResponses.Length());
MOZ_ASSERT_IF(aResponses.Length() > 1, mCachedResponses.empty());
@ -3304,7 +3307,7 @@ void BackgroundCursorChild<CursorType>::HandleMultipleCursorResponses(
bool isFirst = true;
for (auto& response : aResponses) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"PRELOAD: Processing response for key %s", "Processing",
"PRELOAD: Processing response for key %s", "Processing%.0s",
mTransaction->LoggingSerialNumber(),
GetRequest()->LoggingSerialNumber(), response.key().GetBuffer().get());

11
dom/indexedDB/ActorsParent.cpp
View File

@ -9922,7 +9922,7 @@ struct CommonPopulateResponseHelper {
}
IDB_LOG_MARK_PARENT_TRANSACTION_REQUEST(
"PRELOAD: Populating response with key %s", "Populating",
"PRELOAD: Populating response with key %s", "Populating%.0s",
IDB_LOG_ID_STRING(mOp.BackgroundChildLoggingId()),
mOp.TransactionLoggingSerialNumber(), mOp.LoggingSerialNumber(),
mPosition.GetBuffer().get());
@ -23123,9 +23123,9 @@ void TransactionBase::CommitOp::TransactionFinishedAfterUnblock() {
MOZ_ASSERT(mTransaction);
IDB_LOG_MARK_PARENT_TRANSACTION(
"Finished with result 0x%x", "Transaction finished (0x%x)",
"Finished with result 0x%" PRIx32, "Transaction finished (0x%" PRIx32 ")",
IDB_LOG_ID_STRING(mTransaction->GetLoggingInfo()->Id()),
mTransaction->LoggingSerialNumber(), mResultCode);
mTransaction->LoggingSerialNumber(), static_cast<uint32_t>(mResultCode));
mTransaction->SendCompleteNotification(ClampResultCode(mResultCode));
@ -26490,7 +26490,7 @@ void CursorOpBaseHelperBase<CursorType>::PopulateExtraResponses(
IDB_LOG_MARK_PARENT_TRANSACTION_REQUEST(
"PRELOAD: %s: Dropping entries because maximum message size is "
"exceeded: %" PRIu32 "/%zu bytes",
"Dropping too large",
"%.0s Dropping too large (%" PRIu32 "/%zu)",
IDB_LOG_ID_STRING(mOp.mBackgroundChildLoggingId),
mOp.mTransactionLoggingSerialNumber, mOp.mLoggingSerialNumber,
aOperation.get(), extraCount, accumulatedResponseSize);
@ -26504,7 +26504,8 @@ void CursorOpBaseHelperBase<CursorType>::PopulateExtraResponses(
IDB_LOG_MARK_PARENT_TRANSACTION_REQUEST(
"PRELOAD: %s: Number of extra results populated: %" PRIu32 "/%" PRIu32,
"Populated", IDB_LOG_ID_STRING(mOp.mBackgroundChildLoggingId),
"%.0s Populated (%" PRIu32 "/%" PRIu32 ")",
IDB_LOG_ID_STRING(mOp.mBackgroundChildLoggingId),
mOp.mTransactionLoggingSerialNumber, mOp.mLoggingSerialNumber,
aOperation.get(), extraCount, aMaxExtraCount);
}

45
dom/indexedDB/IDBCursor.cpp
View File

@ -397,16 +397,18 @@ void IDBTypedCursor<CursorType>::Continue(JSContext* const aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"cursor(%s).continue(%s)",
"IDBCursor.continue()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBCursor.continue(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(mSource),
IDB_LOG_STRINGIFY(mDirection), IDB_LOG_STRINGIFY(key));
} else {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"index(%s).cursor(%s).continue(%s)",
"IDBCursor.continue()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBCursor.continue(%.0s%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction),
IDB_LOG_STRINGIFY(GetSourceRef().ObjectStore()),
IDB_LOG_STRINGIFY(mSource), IDB_LOG_STRINGIFY(mDirection),
@ -511,8 +513,9 @@ void IDBTypedCursor<CursorType>::ContinuePrimaryKey(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"index(%s).cursor(%s).continuePrimaryKey(%s, %s)",
"IDBCursor.continuePrimaryKey()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBCursor.continuePrimaryKey(%.0s%.0s%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction),
IDB_LOG_STRINGIFY(&GetSourceObjectStoreRef()),
IDB_LOG_STRINGIFY(mSource), IDB_LOG_STRINGIFY(mDirection),
@ -551,17 +554,19 @@ void IDBTypedCursor<CursorType>::Advance(const uint32_t aCount,
if constexpr (IsObjectStoreCursor) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"cursor(%s).advance(%ld)",
"IDBCursor.advance()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"cursor(%s).advance(%" PRIi32 ")",
"IDBCursor.advance(%.0s%.0s%.0s%.0s%" PRIi32 ")",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(mSource),
IDB_LOG_STRINGIFY(mDirection), aCount);
} else {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"index(%s).cursor(%s).advance(%ld)",
"IDBCursor.advance()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"index(%s).cursor(%s).advance(%" PRIi32 ")",
"IDBCursor.advance(%.0s%.0s%.0s%.0s%.0s%" PRIi32 ")",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction),
IDB_LOG_STRINGIFY(GetSourceRef().ObjectStore()),
IDB_LOG_STRINGIFY(mSource), IDB_LOG_STRINGIFY(mDirection), aCount);
@ -657,8 +662,8 @@ RefPtr<IDBRequest> IDBTypedCursor<CursorType>::Update(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"cursor(%s).update(%s)",
"IDBCursor.update()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBCursor.update(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(&objectStore),
IDB_LOG_STRINGIFY(mDirection),
@ -667,8 +672,8 @@ RefPtr<IDBRequest> IDBTypedCursor<CursorType>::Update(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"index(%s).cursor(%s).update(%s)",
"IDBCursor.update()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBCursor.update(%.0s%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(&objectStore),
IDB_LOG_STRINGIFY(mSource), IDB_LOG_STRINGIFY(mDirection),
@ -729,8 +734,8 @@ RefPtr<IDBRequest> IDBTypedCursor<CursorType>::Delete(JSContext* const aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"cursor(%s).delete(%s)",
"IDBCursor.delete()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBCursor.delete(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(&objectStore),
IDB_LOG_STRINGIFY(mDirection),
@ -739,8 +744,8 @@ RefPtr<IDBRequest> IDBTypedCursor<CursorType>::Delete(JSContext* const aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"index(%s).cursor(%s).delete(%s)",
"IDBCursor.delete()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBCursor.delete(%.0s%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(&objectStore),
IDB_LOG_STRINGIFY(mSource), IDB_LOG_STRINGIFY(mDirection),

22
dom/indexedDB/IDBDatabase.cpp
View File

@ -417,9 +417,10 @@ RefPtr<IDBObjectStore> IDBDatabase::CreateObjectStore(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).createObjectStore(%s)",
"IDBDatabase.createObjectStore()", transaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(*transaction), IDB_LOG_STRINGIFY(objectStore));
"IDBDatabase.createObjectStore(%.0s%.0s%.0s)",
transaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(*transaction),
IDB_LOG_STRINGIFY(objectStore));
return objectStore;
}
@ -466,9 +467,10 @@ void IDBDatabase::DeleteObjectStore(const nsAString& aName, ErrorResult& aRv) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).deleteObjectStore(\"%s\")",
"IDBDatabase.deleteObjectStore()", transaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(*transaction), NS_ConvertUTF16toUTF8(aName).get());
"IDBDatabase.deleteObjectStore(%.0s%.0s%.0s)",
transaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(*transaction),
NS_ConvertUTF16toUTF8(aName).get());
}
RefPtr<IDBTransaction> IDBDatabase::Transaction(
@ -603,7 +605,7 @@ RefPtr<IDBTransaction> IDBDatabase::Transaction(
new BackgroundTransactionChild(transaction.clonePtr());
IDB_LOG_MARK_CHILD_TRANSACTION(
"database(%s).transaction(%s)", "IDBDatabase.transaction()",
"database(%s).transaction(%s)", "IDBDatabase.transaction(%.0s%.0s)",
transaction->LoggingSerialNumber(), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(*transaction));
@ -662,9 +664,9 @@ RefPtr<IDBRequest> IDBDatabase::CreateMutableFile(
new BackgroundDatabaseRequestChild(this, request);
IDB_LOG_MARK_CHILD_REQUEST(
"database(%s).createMutableFile(%s)", "IDBDatabase.createMutableFile()",
request->LoggingSerialNumber(), IDB_LOG_STRINGIFY(this),
NS_ConvertUTF16toUTF8(aName).get());
"database(%s).createMutableFile(%s)",
"IDBDatabase.createMutableFile(%.0s%.0s)", request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(this), NS_ConvertUTF16toUTF8(aName).get());
mBackgroundActor->SendPBackgroundIDBDatabaseRequestConstructor(actor, params);

4
dom/indexedDB/IDBFactory.cpp
View File

@ -696,11 +696,11 @@ RefPtr<IDBOpenDBRequest> IDBFactory::OpenInternal(
if (aDeleting) {
IDB_LOG_MARK_CHILD_REQUEST(
"indexedDB.deleteDatabase(\"%s\")", "IDBFactory.deleteDatabase()",
"indexedDB.deleteDatabase(\"%s\")", "IDBFactory.deleteDatabase(%.0s)",
request->LoggingSerialNumber(), NS_ConvertUTF16toUTF8(aName).get());
} else {
IDB_LOG_MARK_CHILD_REQUEST(
"indexedDB.open(\"%s\", %s)", "IDBFactory.open()",
"indexedDB.open(\"%s\", %s)", "IDBFactory.open(%.0s%.0s)",
request->LoggingSerialNumber(), NS_ConvertUTF16toUTF8(aName).get(),
IDB_LOG_STRINGIFY(aVersion));
}

33
dom/indexedDB/IDBIndex.cpp
View File

@ -213,10 +213,11 @@ void IDBIndex::SetName(const nsAString& aName, ErrorResult& aRv) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"rename(%s)",
"IDBIndex.rename()", transaction.LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
loggingOldIndex.get(), IDB_LOG_STRINGIFY(this));
"IDBIndex.rename(%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(transaction.Database()), IDB_LOG_STRINGIFY(transaction),
IDB_LOG_STRINGIFY(mObjectStore), loggingOldIndex.get(),
IDB_LOG_STRINGIFY(this));
mObjectStore->MutableTransactionRef().RenameIndex(mObjectStore, indexId,
aName);
@ -354,8 +355,8 @@ RefPtr<IDBRequest> IDBIndex::GetInternal(bool aKeyOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"getKey(%s)",
"IDBIndex.getKey()", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBIndex.getKey(%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange));
@ -363,7 +364,7 @@ RefPtr<IDBRequest> IDBIndex::GetInternal(bool aKeyOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"get(%s)",
"IDBIndex.get()", transaction.LoggingSerialNumber(),
"IDBIndex.get(%.0s%.0s%.0s%.0s%.0s)", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
@ -429,8 +430,8 @@ RefPtr<IDBRequest> IDBIndex::GetAllInternal(bool aKeysOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"getAllKeys(%s, %s)",
"IDBIndex.getAllKeys()", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBIndex.getAllKeys(%.0s%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange),
@ -439,8 +440,8 @@ RefPtr<IDBRequest> IDBIndex::GetAllInternal(bool aKeysOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"getAll(%s, %s)",
"IDBIndex.getAll()", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBIndex.getAll(%.0s%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange),
@ -507,8 +508,8 @@ RefPtr<IDBRequest> IDBIndex::OpenCursorInternal(bool aKeysOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"openKeyCursor(%s, %s)",
"IDBIndex.openKeyCursor()", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBIndex.openKeyCursor(%.0s%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange),
@ -517,8 +518,8 @@ RefPtr<IDBRequest> IDBIndex::OpenCursorInternal(bool aKeysOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"openCursor(%s, %s)",
"IDBIndex.openCursor()", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBIndex.openCursor(%.0s%.0s%.0s%.0s%.0s%.0s)",
transaction.LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange),
@ -580,7 +581,7 @@ RefPtr<IDBRequest> IDBIndex::Count(JSContext* aCx, JS::Handle<JS::Value> aKey,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).index(%s)."
"count(%s)",
"IDBIndex.count()", transaction.LoggingSerialNumber(),
"IDBIndex.count(%.0s%.0s%.0s%.0s%.0s)", transaction.LoggingSerialNumber(),
request->LoggingSerialNumber(), IDB_LOG_STRINGIFY(transaction.Database()),
IDB_LOG_STRINGIFY(transaction), IDB_LOG_STRINGIFY(mObjectStore),
IDB_LOG_STRINGIFY(this), IDB_LOG_STRINGIFY(keyRange));

53
dom/indexedDB/IDBObjectStore.cpp
View File

@ -907,16 +907,16 @@ RefPtr<IDBRequest> IDBObjectStore::AddOrPut(JSContext* aCx,
if (aOverwrite) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).put(%s)",
"IDBObjectStore.put()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.put(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(key));
} else {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).add(%s)",
"IDBObjectStore.add()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.add(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(key));
@ -975,8 +975,8 @@ RefPtr<IDBRequest> IDBObjectStore::GetAllInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"getAllKeys(%s, %s)",
"IDBObjectStore.getAllKeys()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.getAllKeys(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange), IDB_LOG_STRINGIFY(aLimit));
@ -984,8 +984,8 @@ RefPtr<IDBRequest> IDBObjectStore::GetAllInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"getAll(%s, %s)",
"IDBObjectStore.getAll()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.getAll(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange), IDB_LOG_STRINGIFY(aLimit));
@ -1071,7 +1071,7 @@ RefPtr<IDBRequest> IDBObjectStore::Clear(JSContext* aCx, ErrorResult& aRv) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).clear()",
"IDBObjectStore.clear()", mTransaction->LoggingSerialNumber(),
"IDBObjectStore.clear(%.0s%.0s%.0s)", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this));
@ -1289,8 +1289,8 @@ RefPtr<IDBRequest> IDBObjectStore::GetInternal(bool aKeyOnly, JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).get(%s)",
"IDBObjectStore.get()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.get(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange));
@ -1347,8 +1347,8 @@ RefPtr<IDBRequest> IDBObjectStore::DeleteInternal(JSContext* aCx,
if (!aFromCursor) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).delete(%s)",
"IDBObjectStore.delete()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.delete(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange));
@ -1457,8 +1457,9 @@ RefPtr<IDBIndex> IDBObjectStore::CreateIndex(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).createIndex(%s)",
"IDBObjectStore.createIndex()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBObjectStore.createIndex(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(index));
@ -1523,8 +1524,9 @@ void IDBObjectStore::DeleteIndex(const nsAString& aName, ErrorResult& aRv) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"deleteIndex(\"%s\")",
"IDBObjectStore.deleteIndex()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBObjectStore.deleteIndex(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
NS_ConvertUTF16toUTF8(aName).get());
@ -1565,8 +1567,8 @@ RefPtr<IDBRequest> IDBObjectStore::Count(JSContext* aCx,
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).count(%s)",
"IDBObjectStore.count()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.count(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange));
@ -1629,8 +1631,8 @@ RefPtr<IDBRequest> IDBObjectStore::OpenCursorInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"openKeyCursor(%s, %s)",
"IDBObjectStore.openKeyCursor()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.openKeyCursor(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange), IDB_LOG_STRINGIFY(aDirection));
@ -1638,8 +1640,8 @@ RefPtr<IDBRequest> IDBObjectStore::OpenCursorInternal(
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s)."
"openCursor(%s, %s)",
"IDBObjectStore.openCursor()", mTransaction->LoggingSerialNumber(),
request->LoggingSerialNumber(),
"IDBObjectStore.openCursor(%.0s%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), request->LoggingSerialNumber(),
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), IDB_LOG_STRINGIFY(this),
IDB_LOG_STRINGIFY(keyRange), IDB_LOG_STRINGIFY(aDirection));
@ -1764,8 +1766,9 @@ void IDBObjectStore::SetName(const nsAString& aName, ErrorResult& aRv) {
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"database(%s).transaction(%s).objectStore(%s).rename(%s)",
"IDBObjectStore.rename()", mTransaction->LoggingSerialNumber(),
requestSerialNumber, IDB_LOG_STRINGIFY(mTransaction->Database()),
"IDBObjectStore.rename(%.0s%.0s%.0s%.0s)",
mTransaction->LoggingSerialNumber(), requestSerialNumber,
IDB_LOG_STRINGIFY(mTransaction->Database()),
IDB_LOG_STRINGIFY(*mTransaction), loggingOldObjectStore.get(),
IDB_LOG_STRINGIFY(this));

12
dom/indexedDB/IDBTransaction.cpp
View File

@ -433,8 +433,9 @@ void IDBTransaction::SendAbort(const nsresult aResultCode) {
const uint64_t requestSerialNumber = IDBRequest::NextSerialNumber();
IDB_LOG_MARK_CHILD_TRANSACTION_REQUEST(
"Aborting transaction with result 0x%x", "IDBTransaction abort (0x%x)",
LoggingSerialNumber(), requestSerialNumber, aResultCode);
"Aborting transaction with result 0x%" PRIx32,
"IDBTransaction abort (0x%" PRIx32 ")", LoggingSerialNumber(),
requestSerialNumber, static_cast<uint32_t>(aResultCode));
DoWithTransactionChild(
[aResultCode](auto& actor) { actor.SendAbort(aResultCode); });
@ -795,9 +796,10 @@ void IDBTransaction::FireCompleteOrAbortEvents(const nsresult aResult) {
"IDBTransaction 'complete' event",
mLoggingSerialNumber);
} else {
IDB_LOG_MARK_CHILD_TRANSACTION("Firing 'abort' event with error 0x%x",
"IDBTransaction 'abort' event (0x%x)",
mLoggingSerialNumber, mAbortCode);
IDB_LOG_MARK_CHILD_TRANSACTION(
"Firing 'abort' event with error 0x%" PRIx32,
"IDBTransaction 'abort' event (0x%" PRIx32 ")", mLoggingSerialNumber,
static_cast<uint32_t>(mAbortCode));
}
IgnoredErrorResult rv;

8
dom/indexedDB/ProfilerHelpers.h
View File

@ -106,11 +106,11 @@ void MOZ_FORMAT_PRINTF(2, 3)
#define IDB_LOG_MARK_CONCISE_PARENT "P"
#define IDB_LOG_MARK_CONCISE_CHILD "C"
#define IDB_LOG_MARK_DETAILED_TRANSACTION "Transaction[%lld]"
#define IDB_LOG_MARK_DETAILED_REQUEST "Request[%llu]"
#define IDB_LOG_MARK_DETAILED_TRANSACTION "Transaction[%" PRIi64 "]"
#define IDB_LOG_MARK_DETAILED_REQUEST "Request[%" PRIu64 "]"
#define IDB_LOG_MARK_CONCISE_TRANSACTION "T[%lld]"
#define IDB_LOG_MARK_CONCISE_REQUEST "R[%llu]"
#define IDB_LOG_MARK_CONCISE_TRANSACTION "T[%" PRIi64 "]"
#define IDB_LOG_MARK_CONCISE_REQUEST "R[%" PRIu64 "]"
#define IDB_LOG_MARK_TRANSACTION_REQUEST( \
_detailedPeer, _concisePeer, _detailedFmt, _conciseFmt, _loggingId, \