mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1462784 - Remove the STORAGE category. r=njn 

This was used to label IndexedDB work and work in storage/mozStorage*.
I don't think this deserves its own category; categories are most useful for
the main thread, and most of the time-consuming database-related work happens
on helper threads. The main thread pieces are mostly for asynchronicity-
coordination and don't usually take up time.

This patch labels IndexedDB work as DOM instead (which is maybe debatable) and
the rest as OTHER.

MozReview-Commit-ID: 3UYhFFbi3Ry

--HG--
extra : rebase_source : 16abc3c4bd8ed9ac55b5c188bd10ee26b0566330
This commit is contained in:
Markus Stange 2018-05-18 17:55:18 -04:00
Родитель 916fd5a90a
Коммит b17c2b3e5b
7 изменённых файлов: 122 добавлений и 123 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
dom/indexedDB/ActorsChild.cpp
Просмотреть файл

@ -731,7 +731,7 @@ DispatchErrorEvent(IDBRequest* aRequest,
MOZ_ASSERT(NS_FAILED(aErrorCode));
MOZ_ASSERT(NS_ERROR_GET_MODULE(aErrorCode) == NS_ERROR_MODULE_DOM_INDEXEDDB);
AUTO_PROFILER_LABEL("IndexedDB:DispatchErrorEvent", STORAGE);
AUTO_PROFILER_LABEL("IndexedDB:DispatchErrorEvent", DOM);
RefPtr<IDBRequest> request = aRequest;
RefPtr<IDBTransaction> transaction = aTransaction;
@ -804,7 +804,7 @@ DispatchSuccessEvent(ResultHelper* aResultHelper,
{
MOZ_ASSERT(aResultHelper);
AUTO_PROFILER_LABEL("IndexedDB:DispatchSuccessEvent", STORAGE);
AUTO_PROFILER_LABEL("IndexedDB:DispatchSuccessEvent", DOM);
RefPtr<IDBRequest> request = aResultHelper->Request();
MOZ_ASSERT(request);

222
dom/indexedDB/ActorsParent.cpp
Просмотреть файл

@ -762,7 +762,7 @@ MakeCompressedIndexDataValues(
MOZ_ASSERT(!aCompressedIndexDataValues);
MOZ_ASSERT(aCompressedIndexDataValuesLength);
AUTO_PROFILER_LABEL("MakeCompressedIndexDataValues", STORAGE);
AUTO_PROFILER_LABEL("MakeCompressedIndexDataValues", DOM);
const uint32_t arrayLength = aIndexValues.Length();
if (!arrayLength) {
@ -854,7 +854,7 @@ ReadCompressedIndexDataValuesFromBlob(const uint8_t* aBlobData,
MOZ_ASSERT(aBlobDataLength);
MOZ_ASSERT(aIndexValues.IsEmpty());
AUTO_PROFILER_LABEL("ReadCompressedIndexDataValuesFromBlob", STORAGE);
AUTO_PROFILER_LABEL("ReadCompressedIndexDataValuesFromBlob", DOM);
if (uintptr_t(aBlobData) > UINTPTR_MAX - aBlobDataLength) {
IDB_REPORT_INTERNAL_ERR();
@ -995,7 +995,7 @@ CreateFileTables(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("CreateFileTables", STORAGE);
AUTO_PROFILER_LABEL("CreateFileTables", DOM);
// Table `file`
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -1067,7 +1067,7 @@ CreateTables(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("CreateTables", STORAGE);
AUTO_PROFILER_LABEL("CreateTables", DOM);
// Table `database`
@ -1215,7 +1215,7 @@ UpgradeSchemaFrom4To5(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom4To5", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom4To5", DOM);
nsresult rv;
@ -1332,7 +1332,7 @@ UpgradeSchemaFrom5To6(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom5To6", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom5To6", DOM);
// First, drop all the indexes we're no longer going to use.
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -1780,7 +1780,7 @@ UpgradeSchemaFrom6To7(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom6To7", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom6To7", DOM);
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TEMPORARY TABLE temp_upgrade ("
@ -1853,7 +1853,7 @@ UpgradeSchemaFrom7To8(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom7To8", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom7To8", DOM);
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TEMPORARY TABLE temp_upgrade ("
@ -1946,7 +1946,7 @@ private:
MOZ_ASSERT(aArguments);
MOZ_ASSERT(aResult);
AUTO_PROFILER_LABEL("CompressDataBlobsFunction::OnFunctionCall", STORAGE);
AUTO_PROFILER_LABEL("CompressDataBlobsFunction::OnFunctionCall", DOM);
uint32_t argc;
nsresult rv = aArguments->GetNumEntries(&argc);
@ -2005,7 +2005,7 @@ UpgradeSchemaFrom8To9_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom8To9_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom8To9_0", DOM);
// We no longer use the dataVersion column.
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@ -2058,7 +2058,7 @@ UpgradeSchemaFrom9_0To10_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom9_0To10_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom9_0To10_0", DOM);
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"ALTER TABLE object_data ADD COLUMN file_ids TEXT;"
@ -2093,7 +2093,7 @@ UpgradeSchemaFrom10_0To11_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom10_0To11_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom10_0To11_0", DOM);
nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"CREATE TEMPORARY TABLE temp_upgrade ("
@ -2271,7 +2271,7 @@ private:
MOZ_ASSERT(aArguments);
MOZ_ASSERT(aResult);
AUTO_PROFILER_LABEL("EncodeKeysFunction::OnFunctionCall", STORAGE);
AUTO_PROFILER_LABEL("EncodeKeysFunction::OnFunctionCall", DOM);
uint32_t argc;
nsresult rv = aArguments->GetNumEntries(&argc);
@ -2322,7 +2322,7 @@ UpgradeSchemaFrom11_0To12_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom11_0To12_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom11_0To12_0", DOM);
NS_NAMED_LITERAL_CSTRING(encoderName, "encode");
@ -2591,7 +2591,7 @@ UpgradeSchemaFrom12_0To13_0(mozIStorageConnection* aConnection,
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom12_0To13_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom12_0To13_0", DOM);
nsresult rv;
@ -3577,7 +3577,7 @@ UpgradeSchemaFrom17_0To18_0(mozIStorageConnection* aConnection,
MOZ_ASSERT(aConnection);
MOZ_ASSERT(!aOrigin.IsEmpty());
AUTO_PROFILER_LABEL("UpgradeSchemaFrom17_0To18_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom17_0To18_0", DOM);
return UpgradeSchemaFrom17_0To18_0Helper::DoUpgrade(aConnection, aOrigin);
}
@ -3589,7 +3589,7 @@ UpgradeSchemaFrom18_0To19_0(mozIStorageConnection* aConnection)
MOZ_ASSERT(aConnection);
nsresult rv;
AUTO_PROFILER_LABEL("UpgradeSchemaFrom18_0To19_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom18_0To19_0", DOM);
rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"ALTER TABLE object_store_index "
@ -3688,7 +3688,7 @@ UpgradeSchemaFrom19_0To20_0(nsIFile* aFMDirectory,
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom19_0To20_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom19_0To20_0", DOM);
nsCOMPtr<mozIStorageStatement> stmt;
nsresult rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
@ -3904,7 +3904,7 @@ UpgradeIndexDataValuesFunction::OnFunctionCall(mozIStorageValueArray* aArguments
MOZ_ASSERT(aResult);
AUTO_PROFILER_LABEL(
"UpgradeIndexDataValuesFunction::OnFunctionCall", STORAGE);
"UpgradeIndexDataValuesFunction::OnFunctionCall", DOM);
uint32_t argc;
nsresult rv = aArguments->GetNumEntries(&argc);
@ -3963,7 +3963,7 @@ UpgradeSchemaFrom20_0To21_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom20_0To21_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom20_0To21_0", DOM);
RefPtr<UpgradeIndexDataValuesFunction> function =
new UpgradeIndexDataValuesFunction();
@ -4018,7 +4018,7 @@ UpgradeSchemaFrom22_0To23_0(mozIStorageConnection* aConnection,
MOZ_ASSERT(aConnection);
MOZ_ASSERT(!aOrigin.IsEmpty());
AUTO_PROFILER_LABEL("UpgradeSchemaFrom22_0To23_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom22_0To23_0", DOM);
nsCOMPtr<mozIStorageStatement> stmt;
nsresult rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
@ -4092,7 +4092,7 @@ private:
MOZ_ASSERT(aResult);
AUTO_PROFILER_LABEL(
"StripObsoleteOriginAttributesFunction::OnFunctionCall", STORAGE);
"StripObsoleteOriginAttributesFunction::OnFunctionCall", DOM);
#ifdef DEBUG
{
@ -4139,7 +4139,7 @@ UpgradeSchemaFrom25_0To26_0(mozIStorageConnection* aConnection)
AssertIsOnIOThread();
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom25_0To26_0", STORAGE);
AUTO_PROFILER_LABEL("UpgradeSchemaFrom25_0To26_0", DOM);
NS_NAMED_LITERAL_CSTRING(functionName, "strip_obsolete_attributes");
@ -4482,7 +4482,7 @@ CreateStorageConnection(nsIFile* aDBFile,
MOZ_ASSERT(aFMDirectory);
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("CreateStorageConnection", STORAGE);
AUTO_PROFILER_LABEL("CreateStorageConnection", DOM);
nsresult rv;
bool exists;
@ -4947,7 +4947,7 @@ GetStorageConnection(nsIFile* aDatabaseFile,
MOZ_ASSERT(aDatabaseFile);
MOZ_ASSERT(aConnection);
AUTO_PROFILER_LABEL("GetStorageConnection", STORAGE);
AUTO_PROFILER_LABEL("GetStorageConnection", DOM);
bool exists;
nsresult rv = aDatabaseFile->Exists(&exists);
@ -10525,7 +10525,7 @@ DatabaseConnection::GetCachedStatement(const nsACString& aQuery,
MOZ_ASSERT(aCachedStatement);
MOZ_ASSERT(mStorageConnection);
AUTO_PROFILER_LABEL("DatabaseConnection::GetCachedStatement", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::GetCachedStatement", DOM);
nsCOMPtr<mozIStorageStatement> stmt;
@ -10562,7 +10562,7 @@ DatabaseConnection::BeginWriteTransaction()
MOZ_ASSERT(mInReadTransaction);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::BeginWriteTransaction", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::BeginWriteTransaction", DOM);
// Release our read locks.
CachedStatement rollbackStmt;
@ -10639,7 +10639,7 @@ DatabaseConnection::CommitWriteTransaction()
MOZ_ASSERT(!mInReadTransaction);
MOZ_ASSERT(mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::CommitWriteTransaction", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::CommitWriteTransaction", DOM);
CachedStatement stmt;
nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING("COMMIT;"), &stmt);
@ -10663,7 +10663,7 @@ DatabaseConnection::RollbackWriteTransaction()
MOZ_ASSERT(!mInReadTransaction);
MOZ_ASSERT(mStorageConnection);
AUTO_PROFILER_LABEL("DatabaseConnection::RollbackWriteTransaction", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::RollbackWriteTransaction", DOM);
if (!mInWriteTransaction) {
return;
@ -10690,7 +10690,7 @@ DatabaseConnection::FinishWriteTransaction()
MOZ_ASSERT(!mInReadTransaction);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::FinishWriteTransaction", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::FinishWriteTransaction", DOM);
if (mUpdateRefcountFunction) {
mUpdateRefcountFunction->Reset();
@ -10718,7 +10718,7 @@ DatabaseConnection::StartSavepoint()
MOZ_ASSERT(mUpdateRefcountFunction);
MOZ_ASSERT(mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", DOM);
CachedStatement stmt;
nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING(SAVEPOINT_CLAUSE), &stmt);
@ -10749,7 +10749,7 @@ DatabaseConnection::ReleaseSavepoint()
MOZ_ASSERT(mUpdateRefcountFunction);
MOZ_ASSERT(mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::ReleaseSavepoint", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::ReleaseSavepoint", DOM);
CachedStatement stmt;
nsresult rv = GetCachedStatement(
@ -10778,7 +10778,7 @@ DatabaseConnection::RollbackSavepoint()
MOZ_ASSERT(mUpdateRefcountFunction);
MOZ_ASSERT(mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::RollbackSavepoint", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::RollbackSavepoint", DOM);
#ifdef DEBUG
MOZ_ASSERT(mDEBUGSavepointCount);
@ -10809,7 +10809,7 @@ DatabaseConnection::CheckpointInternal(CheckpointMode aMode)
MOZ_ASSERT(!mInReadTransaction);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::CheckpointInternal", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::CheckpointInternal", DOM);
nsAutoCString stmtString;
stmtString.AssignLiteral("PRAGMA wal_checkpoint(");
@ -10859,7 +10859,7 @@ DatabaseConnection::DoIdleProcessing(bool aNeedsCheckpoint)
MOZ_ASSERT(mInReadTransaction);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::DoIdleProcessing", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::DoIdleProcessing", DOM);
DatabaseConnection::CachedStatement freelistStmt;
uint32_t freelistCount;
@ -10938,7 +10938,7 @@ DatabaseConnection::ReclaimFreePagesWhileIdle(
MOZ_ASSERT(!mInReadTransaction);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::ReclaimFreePagesWhileIdle", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::ReclaimFreePagesWhileIdle", DOM);
// Make sure we don't keep working if anything else needs this thread.
nsIThread* currentThread = NS_GetCurrentThread();
@ -11050,7 +11050,7 @@ DatabaseConnection::GetFreelistCount(CachedStatement& aCachedStatement,
AssertIsOnConnectionThread();
MOZ_ASSERT(aFreelistCount);
AUTO_PROFILER_LABEL("DatabaseConnection::GetFreelistCount", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::GetFreelistCount", DOM);
nsresult rv;
@ -11094,7 +11094,7 @@ DatabaseConnection::Close()
MOZ_ASSERT(!mDEBUGSavepointCount);
MOZ_ASSERT(!mInWriteTransaction);
AUTO_PROFILER_LABEL("DatabaseConnection::Close", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::Close", DOM);
if (mUpdateRefcountFunction) {
MOZ_ALWAYS_SUCCEEDS(
@ -11379,7 +11379,7 @@ UpdateRefcountFunction::WillCommit()
MOZ_ASSERT(mConnection);
mConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("DatabaseConnection::UpdateRefcountFunction::WillCommit", STORAGE);
AUTO_PROFILER_LABEL("DatabaseConnection::UpdateRefcountFunction::WillCommit", DOM);
DatabaseUpdateFunction function(this);
for (auto iter = mFileInfoEntries.ConstIter(); !iter.Done(); iter.Next()) {
@ -11413,7 +11413,7 @@ UpdateRefcountFunction::DidCommit()
mConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::DidCommit", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::DidCommit", DOM);
for (auto iter = mFileInfoEntries.ConstIter(); !iter.Done(); iter.Next()) {
FileInfoEntry* value = iter.Data();
@ -11438,7 +11438,7 @@ UpdateRefcountFunction::DidAbort()
mConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::DidAbort", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::DidAbort", DOM);
if (NS_FAILED(RemoveJournals(mJournalsToRemoveAfterAbort))) {
NS_WARNING("RemoveJournals failed!");
@ -11599,7 +11599,7 @@ UpdateRefcountFunction::ProcessValue(mozIStorageValueArray* aValues,
MOZ_ASSERT(aValues);
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::ProcessValue", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::ProcessValue", DOM);
int32_t type;
nsresult rv = aValues->GetTypeOfIndex(aIndex, &type);
@ -11668,7 +11668,7 @@ UpdateRefcountFunction::CreateJournals()
mConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::CreateJournals", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::CreateJournals", DOM);
nsCOMPtr<nsIFile> journalDirectory = mFileManager->GetJournalDirectory();
if (NS_WARN_IF(!journalDirectory)) {
@ -11703,7 +11703,7 @@ UpdateRefcountFunction::RemoveJournals(const nsTArray<int64_t>& aJournals)
mConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::RemoveJournals", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::RemoveJournals", DOM);
nsCOMPtr<nsIFile> journalDirectory = mFileManager->GetJournalDirectory();
if (NS_WARN_IF(!journalDirectory)) {
@ -11737,7 +11737,7 @@ UpdateRefcountFunction::OnFunctionCall(mozIStorageValueArray* aValues,
MOZ_ASSERT(_retval);
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::OnFunctionCall", STORAGE);
"DatabaseConnection::UpdateRefcountFunction::OnFunctionCall", DOM);
uint32_t numEntries;
nsresult rv = aValues->GetNumEntries(&numEntries);
@ -11797,7 +11797,7 @@ DatabaseUpdateFunction::UpdateInternal(int64_t aId,
AUTO_PROFILER_LABEL(
"DatabaseConnection::UpdateRefcountFunction::"
"DatabaseUpdateFunction::UpdateInternal",
STORAGE);
DOM);
DatabaseConnection* connection = mFunction->mConnection;
MOZ_ASSERT(connection);
@ -11944,7 +11944,7 @@ ConnectionPool::IdleTimerCallback(nsITimer* aTimer, void* aClosure)
{
MOZ_ASSERT(aTimer);
AUTO_PROFILER_LABEL("ConnectionPool::IdleTimerCallback", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::IdleTimerCallback", DOM);
auto* self = static_cast<ConnectionPool*>(aClosure);
MOZ_ASSERT(self);
@ -12008,7 +12008,7 @@ ConnectionPool::GetOrCreateConnection(const Database* aDatabase,
MOZ_ASSERT(!IsOnBackgroundThread());
MOZ_ASSERT(aDatabase);
AUTO_PROFILER_LABEL("ConnectionPool::GetOrCreateConnection", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::GetOrCreateConnection", DOM);
DatabaseInfo* dbInfo;
{
@ -12073,7 +12073,7 @@ ConnectionPool::Start(const nsID& aBackgroundChildLoggingId,
MOZ_ASSERT(mNextTransactionId < UINT64_MAX);
MOZ_ASSERT(!mShutdownRequested);
AUTO_PROFILER_LABEL("ConnectionPool::Start", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::Start", DOM);
const uint64_t transactionId = ++mNextTransactionId;
@ -12168,7 +12168,7 @@ ConnectionPool::Dispatch(uint64_t aTransactionId, nsIRunnable* aRunnable)
AssertIsOnOwningThread();
MOZ_ASSERT(aRunnable);
AUTO_PROFILER_LABEL("ConnectionPool::Dispatch", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::Dispatch", DOM);
TransactionInfo* transactionInfo = mTransactions.Get(aTransactionId);
MOZ_ASSERT(transactionInfo);
@ -12201,7 +12201,7 @@ ConnectionPool::Finish(uint64_t aTransactionId, FinishCallback* aCallback)
MOZ_ASSERT(!transactionInfo->mFinished);
#endif
AUTO_PROFILER_LABEL("ConnectionPool::Finish", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::Finish", DOM);
RefPtr<FinishCallbackWrapper> wrapper =
new FinishCallbackWrapper(this, aTransactionId, aCallback);
@ -12222,7 +12222,7 @@ ConnectionPool::WaitForDatabasesToComplete(nsTArray<nsCString>&& aDatabaseIds,
MOZ_ASSERT(!aDatabaseIds.IsEmpty());
MOZ_ASSERT(aCallback);
AUTO_PROFILER_LABEL("ConnectionPool::WaitForDatabasesToComplete", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::WaitForDatabasesToComplete", DOM);
bool mayRunCallbackImmediately = true;
@ -12254,7 +12254,7 @@ ConnectionPool::Shutdown()
MOZ_ASSERT(!mShutdownRequested);
MOZ_ASSERT(!mShutdownComplete);
AUTO_PROFILER_LABEL("ConnectionPool::Shutdown", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::Shutdown", DOM);
mShutdownRequested = true;
@ -12289,7 +12289,7 @@ ConnectionPool::Cleanup()
MOZ_ASSERT(!mTransactions.Count());
MOZ_ASSERT(mIdleThreads.IsEmpty());
AUTO_PROFILER_LABEL("ConnectionPool::Cleanup", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::Cleanup", DOM);
if (!mCompleteCallbacks.IsEmpty()) {
// Run all callbacks manually now.
@ -12322,7 +12322,7 @@ ConnectionPool::AdjustIdleTimer()
AssertIsOnOwningThread();
MOZ_ASSERT(mIdleTimer);
AUTO_PROFILER_LABEL("ConnectionPool::AdjustIdleTimer", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::AdjustIdleTimer", DOM);
// Figure out the next time at which we should release idle resources. This
// includes both databases and threads.
@ -12422,7 +12422,7 @@ ConnectionPool::CloseIdleDatabases()
AssertIsOnOwningThread();
MOZ_ASSERT(mShutdownRequested);
AUTO_PROFILER_LABEL("ConnectionPool::CloseIdleDatabases", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::CloseIdleDatabases", DOM);
if (!mIdleDatabases.IsEmpty()) {
for (IdleDatabaseInfo& idleInfo : mIdleDatabases) {
@ -12446,7 +12446,7 @@ ConnectionPool::ShutdownIdleThreads()
AssertIsOnOwningThread();
MOZ_ASSERT(mShutdownRequested);
AUTO_PROFILER_LABEL("ConnectionPool::ShutdownIdleThreads", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::ShutdownIdleThreads", DOM);
if (!mIdleThreads.IsEmpty()) {
for (uint32_t threadCount = mIdleThreads.Length(), threadIndex = 0;
@ -12465,7 +12465,7 @@ ConnectionPool::ScheduleTransaction(TransactionInfo* aTransactionInfo,
AssertIsOnOwningThread();
MOZ_ASSERT(aTransactionInfo);
AUTO_PROFILER_LABEL("ConnectionPool::ScheduleTransaction", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::ScheduleTransaction", DOM);
DatabaseInfo* dbInfo = aTransactionInfo->mDatabaseInfo;
MOZ_ASSERT(dbInfo);
@ -12596,7 +12596,7 @@ ConnectionPool::NoteFinishedTransaction(uint64_t aTransactionId)
{
AssertIsOnOwningThread();
AUTO_PROFILER_LABEL("ConnectionPool::NoteFinishedTransaction", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::NoteFinishedTransaction", DOM);
TransactionInfo* transactionInfo = mTransactions.Get(aTransactionId);
MOZ_ASSERT(transactionInfo);
@ -12682,7 +12682,7 @@ ConnectionPool::ScheduleQueuedTransactions(ThreadInfo& aThreadInfo)
MOZ_ASSERT(!mQueuedTransactions.IsEmpty());
MOZ_ASSERT(!mIdleThreads.Contains(aThreadInfo));
AUTO_PROFILER_LABEL("ConnectionPool::ScheduleQueuedTransactions", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::ScheduleQueuedTransactions", DOM);
mIdleThreads.InsertElementSorted(aThreadInfo);
@ -12714,7 +12714,7 @@ ConnectionPool::NoteIdleDatabase(DatabaseInfo* aDatabaseInfo)
MOZ_ASSERT(aDatabaseInfo->mThreadInfo.mRunnable);
MOZ_ASSERT(!mIdleDatabases.Contains(aDatabaseInfo));
AUTO_PROFILER_LABEL("ConnectionPool::NoteIdleDatabase", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::NoteIdleDatabase", DOM);
const bool otherDatabasesWaiting = !mQueuedTransactions.IsEmpty();
@ -12751,7 +12751,7 @@ ConnectionPool::NoteClosedDatabase(DatabaseInfo* aDatabaseInfo)
MOZ_ASSERT(aDatabaseInfo->mClosing);
MOZ_ASSERT(!mIdleDatabases.Contains(aDatabaseInfo));
AUTO_PROFILER_LABEL("ConnectionPool::NoteClosedDatabase", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::NoteClosedDatabase", DOM);
aDatabaseInfo->mClosing = false;
@ -12855,7 +12855,7 @@ ConnectionPool::MaybeFireCallback(DatabasesCompleteCallback* aCallback)
MOZ_ASSERT(!aCallback->mDatabaseIds.IsEmpty());
MOZ_ASSERT(aCallback->mCallback);
AUTO_PROFILER_LABEL("ConnectionPool::MaybeFireCallback", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::MaybeFireCallback", DOM);
for (uint32_t count = aCallback->mDatabaseIds.Length(), index = 0;
index < count;
@ -12926,7 +12926,7 @@ ConnectionPool::CloseDatabaseWhenIdleInternal(const nsACString& aDatabaseId)
AssertIsOnOwningThread();
MOZ_ASSERT(!aDatabaseId.IsEmpty());
AUTO_PROFILER_LABEL("ConnectionPool::CloseDatabaseWhenIdleInternal", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::CloseDatabaseWhenIdleInternal", DOM);
if (DatabaseInfo* dbInfo = mDatabases.Get(aDatabaseId)) {
if (mIdleDatabases.RemoveElement(dbInfo) ||
@ -13003,7 +13003,7 @@ CloseConnectionRunnable::Run()
{
MOZ_ASSERT(mDatabaseInfo);
AUTO_PROFILER_LABEL("ConnectionPool::CloseConnectionRunnable::Run", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::CloseConnectionRunnable::Run", DOM);
if (mOwningEventTarget) {
MOZ_ASSERT(mDatabaseInfo->mClosing);
@ -13132,7 +13132,7 @@ FinishCallbackWrapper::Run()
MOZ_ASSERT(mCallback);
MOZ_ASSERT(mOwningEventTarget);
AUTO_PROFILER_LABEL("ConnectionPool::FinishCallbackWrapper::Run", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::FinishCallbackWrapper::Run", DOM);
if (!mHasRunOnce) {
MOZ_ASSERT(!IsOnBackgroundThread());
@ -13196,7 +13196,7 @@ ThreadRunnable::Run()
{
// Scope for the profiler label.
AUTO_PROFILER_LABEL("ConnectionPool::ThreadRunnable::Run", STORAGE);
AUTO_PROFILER_LABEL("ConnectionPool::ThreadRunnable::Run", DOM);
DebugOnly<nsIThread*> currentThread = NS_GetCurrentThread();
MOZ_ASSERT(currentThread);
@ -14004,7 +14004,7 @@ Database::EnsureConnection()
MOZ_ASSERT(!NS_IsMainThread());
MOZ_ASSERT(!IsOnBackgroundThread());
AUTO_PROFILER_LABEL("Database::EnsureConnection", STORAGE);
AUTO_PROFILER_LABEL("Database::EnsureConnection", DOM);
if (!mConnection || !mConnection->GetStorageConnection()) {
nsresult rv =
@ -19466,7 +19466,7 @@ UpgradeFileIdsFunction::OnFunctionCall(mozIStorageValueArray* aArguments,
MOZ_ASSERT(aResult);
MOZ_ASSERT(mFileManager);
AUTO_PROFILER_LABEL("UpgradeFileIdsFunction::OnFunctionCall", STORAGE);
AUTO_PROFILER_LABEL("UpgradeFileIdsFunction::OnFunctionCall", DOM);
uint32_t argc;
nsresult rv = aArguments->GetNumEntries(&argc);
@ -19639,7 +19639,7 @@ DatabaseOperationBase::GetStructuredCloneReadInfoFromBlob(
MOZ_ASSERT(aInfo);
AUTO_PROFILER_LABEL(
"DatabaseOperationBase::GetStructuredCloneReadInfoFromBlob", STORAGE);
"DatabaseOperationBase::GetStructuredCloneReadInfoFromBlob", DOM);
const char* compressed = reinterpret_cast<const char*>(aBlobData);
size_t compressedLength = size_t(aBlobDataLength);
@ -19693,7 +19693,7 @@ DatabaseOperationBase::GetStructuredCloneReadInfoFromExternalBlob(
AUTO_PROFILER_LABEL(
"DatabaseOperationBase::GetStructuredCloneReadInfoFromExternalBlob",
STORAGE);
DOM);
nsresult rv;
@ -19922,7 +19922,7 @@ DatabaseOperationBase::IndexDataValuesFromUpdateInfos(
MOZ_ASSERT_IF(!aUpdateInfos.IsEmpty(), aUniqueIndexTable.Count());
AUTO_PROFILER_LABEL(
"DatabaseOperationBase::IndexDataValuesFromUpdateInfos", STORAGE);
"DatabaseOperationBase::IndexDataValuesFromUpdateInfos", DOM);
const uint32_t count = aUpdateInfos.Length();
@ -19965,7 +19965,7 @@ DatabaseOperationBase::InsertIndexTableRows(
aConnection->AssertIsOnConnectionThread();
MOZ_ASSERT(!aObjectStoreKey.IsUnset());
AUTO_PROFILER_LABEL("DatabaseOperationBase::InsertIndexTableRows", STORAGE);
AUTO_PROFILER_LABEL("DatabaseOperationBase::InsertIndexTableRows", DOM);
const uint32_t count = aIndexValues.Length();
if (!count) {
@ -20073,7 +20073,7 @@ DatabaseOperationBase::DeleteIndexDataTableRows(
MOZ_ASSERT(!aObjectStoreKey.IsUnset());
AUTO_PROFILER_LABEL(
"DatabaseOperationBase::DeleteIndexDataTableRows", STORAGE);
"DatabaseOperationBase::DeleteIndexDataTableRows", DOM);
const uint32_t count = aIndexValues.Length();
if (!count) {
@ -20167,7 +20167,7 @@ DatabaseOperationBase::DeleteObjectStoreDataTableRowsWithIndexes(
AUTO_PROFILER_LABEL(
"DatabaseOperationBase::DeleteObjectStoreDataTableRowsWithIndexes",
STORAGE);
DOM);
const bool singleRowOnly =
aKeyRange.type() == OptionalKeyRange::TSerializedKeyRange &&
@ -20307,7 +20307,7 @@ DatabaseOperationBase::UpdateIndexValues(
aConnection->AssertIsOnConnectionThread();
MOZ_ASSERT(!aObjectStoreKey.IsUnset());
AUTO_PROFILER_LABEL("DatabaseOperationBase::UpdateIndexValues", STORAGE);
AUTO_PROFILER_LABEL("DatabaseOperationBase::UpdateIndexValues", DOM);
UniqueFreePtr<uint8_t> indexDataValues;
uint32_t indexDataValuesLength;
@ -21472,7 +21472,7 @@ OpenDatabaseOp::DoDatabaseWork()
AssertIsOnIOThread();
MOZ_ASSERT(mState == State::DatabaseWorkOpen);
AUTO_PROFILER_LABEL("OpenDatabaseOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("OpenDatabaseOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) ||
!OperationMayProceed()) {
@ -22664,7 +22664,7 @@ VersionChangeOp::DoDatabaseWork(DatabaseConnection* aConnection)
}
AUTO_PROFILER_LABEL(
"OpenDatabaseOp::VersionChangeOp::DoDatabaseWork", STORAGE);
"OpenDatabaseOp::VersionChangeOp::DoDatabaseWork", DOM);
IDB_LOG_MARK("IndexedDB %s: Parent Transaction[%lld]: "
"Beginning database work",
@ -22765,7 +22765,7 @@ DeleteDatabaseOp::LoadPreviousVersion(nsIFile* aDatabaseFile)
MOZ_ASSERT(mState == State::DatabaseWorkOpen);
MOZ_ASSERT(!mPreviousVersion);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::LoadPreviousVersion", STORAGE);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::LoadPreviousVersion", DOM);
nsresult rv;
@ -22852,7 +22852,7 @@ DeleteDatabaseOp::DoDatabaseWork()
AssertIsOnIOThread();
MOZ_ASSERT(mState == State::DatabaseWorkOpen);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) ||
!OperationMayProceed()) {
@ -23102,7 +23102,7 @@ VersionChangeOp::DeleteFile(nsIFile* aDirectory,
MOZ_ASSERT(mDeleteDatabaseOp->mState == State::DatabaseWorkVersionChange);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::VersionChangeOp::DeleteFile", STORAGE);
AUTO_PROFILER_LABEL("DeleteDatabaseOp::VersionChangeOp::DeleteFile", DOM);
nsCOMPtr<nsIFile> file;
nsresult rv = aDirectory->Clone(getter_AddRefs(file));
@ -23162,7 +23162,7 @@ VersionChangeOp::RunOnIOThread()
MOZ_ASSERT(mDeleteDatabaseOp->mState == State::DatabaseWorkVersionChange);
AUTO_PROFILER_LABEL(
"DeleteDatabaseOp::VersionChangeOp::RunOnIOThread", STORAGE);
"DeleteDatabaseOp::VersionChangeOp::RunOnIOThread", DOM);
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnNonBackgroundThread()) ||
!OperationMayProceed()) {
@ -23494,7 +23494,7 @@ TransactionDatabaseOperationBase::RunOnConnectionThread()
MOZ_ASSERT(NS_SUCCEEDED(mResultCode));
AUTO_PROFILER_LABEL(
"TransactionDatabaseOperationBase::RunOnConnectionThread", STORAGE);
"TransactionDatabaseOperationBase::RunOnConnectionThread", DOM);
// There are several cases where we don't actually have to to any work here.
@ -23882,7 +23882,7 @@ CommitOp::Run()
MOZ_ASSERT(mTransaction);
mTransaction->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("TransactionBase::CommitOp::Run", STORAGE);
AUTO_PROFILER_LABEL("TransactionBase::CommitOp::Run", DOM);
IDB_LOG_MARK("IndexedDB %s: Parent Transaction[%lld] Request[%llu]: "
"Beginning database work",
@ -23974,7 +23974,7 @@ CommitOp::TransactionFinishedBeforeUnblock()
AssertIsOnBackgroundThread();
MOZ_ASSERT(mTransaction);
AUTO_PROFILER_LABEL("CommitOp::TransactionFinishedBeforeUnblock", STORAGE);
AUTO_PROFILER_LABEL("CommitOp::TransactionFinishedBeforeUnblock", DOM);
if (!IsActorDestroyed()) {
mTransaction->UpdateMetadata(mResultCode);
@ -24139,7 +24139,7 @@ CreateFileOp::DoDatabaseWork()
AssertIsOnIOThread();
MOZ_ASSERT(mState == State::DatabaseWork);
AUTO_PROFILER_LABEL("CreateFileOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("CreateFileOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
NS_WARNING("Refusing to create file because disk space is low!");
@ -24282,7 +24282,7 @@ CreateObjectStoreOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("CreateObjectStoreOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("CreateObjectStoreOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
@ -24384,7 +24384,7 @@ DeleteObjectStoreOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("DeleteObjectStoreOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("DeleteObjectStoreOp::DoDatabaseWork", DOM);
NS_NAMED_LITERAL_CSTRING(objectStoreIdString, "object_store_id");
@ -24605,7 +24605,7 @@ RenameObjectStoreOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("RenameObjectStoreOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("RenameObjectStoreOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
@ -24701,7 +24701,7 @@ CreateIndexOp::InsertDataFromObjectStore(DatabaseConnection* aConnection)
MOZ_ASSERT(!IndexedDatabaseManager::InLowDiskSpaceMode());
MOZ_ASSERT(mMaybeUniqueIndexTable);
AUTO_PROFILER_LABEL("CreateIndexOp::InsertDataFromObjectStore", STORAGE);
AUTO_PROFILER_LABEL("CreateIndexOp::InsertDataFromObjectStore", DOM);
nsCOMPtr<mozIStorageConnection> storageConnection =
aConnection->GetStorageConnection();
@ -24791,7 +24791,7 @@ CreateIndexOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("CreateIndexOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("CreateIndexOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
@ -24933,7 +24933,7 @@ UpdateIndexDataValuesFunction::OnFunctionCall(mozIStorageValueArray* aValues,
MOZ_ASSERT(mOp);
AUTO_PROFILER_LABEL(
"CreateIndexOp::UpdateIndexDataValuesFunction::OnFunctionCall", STORAGE);
"CreateIndexOp::UpdateIndexDataValuesFunction::OnFunctionCall", DOM);
#ifdef DEBUG
{
@ -25162,7 +25162,7 @@ DeleteIndexOp::RemoveReferencesToIndex(DatabaseConnection* aConnection,
};
};
AUTO_PROFILER_LABEL("DeleteIndexOp::RemoveReferencesToIndex", STORAGE);
AUTO_PROFILER_LABEL("DeleteIndexOp::RemoveReferencesToIndex", DOM);
if (mIsLastIndex) {
// There is no need to parse the previous entry in the index_data_values
@ -25302,7 +25302,7 @@ DeleteIndexOp::DoDatabaseWork(DatabaseConnection* aConnection)
}
#endif
AUTO_PROFILER_LABEL("DeleteIndexOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("DeleteIndexOp::DoDatabaseWork", DOM);
DatabaseConnection::AutoSavepoint autoSave;
nsresult rv = autoSave.Start(Transaction());
@ -25559,7 +25559,7 @@ RenameIndexOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("RenameIndexOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("RenameIndexOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
@ -26059,7 +26059,7 @@ ObjectStoreAddOrPutRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
aConnection->AssertIsOnConnectionThread();
MOZ_ASSERT(aConnection->GetStorageConnection());
AUTO_PROFILER_LABEL("ObjectStoreAddOrPutRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreAddOrPutRequestOp::DoDatabaseWork", DOM);
if (NS_WARN_IF(IndexedDatabaseManager::InLowDiskSpaceMode())) {
return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
@ -26555,7 +26555,7 @@ ObjectStoreGetRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
OptionalKeyRange::TSerializedKeyRange);
MOZ_ASSERT_IF(!mGetAll, mLimit == 1);
AUTO_PROFILER_LABEL("ObjectStoreGetRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreGetRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -26769,7 +26769,7 @@ ObjectStoreGetKeyRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("ObjectStoreGetKeyRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreGetKeyRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -26890,7 +26890,7 @@ ObjectStoreDeleteRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
{
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("ObjectStoreDeleteRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreDeleteRequestOp::DoDatabaseWork", DOM);
DatabaseConnection::AutoSavepoint autoSave;
nsresult rv = autoSave.Start(Transaction());
@ -26981,7 +26981,7 @@ ObjectStoreClearRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("ObjectStoreClearRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreClearRequestOp::DoDatabaseWork", DOM);
DatabaseConnection::AutoSavepoint autoSave;
nsresult rv = autoSave.Start(Transaction());
@ -27042,7 +27042,7 @@ ObjectStoreCountRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("ObjectStoreCountRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("ObjectStoreCountRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mParams.optionalKeyRange().type() == OptionalKeyRange::TSerializedKeyRange;
@ -27205,7 +27205,7 @@ IndexGetRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
OptionalKeyRange::TSerializedKeyRange);
MOZ_ASSERT_IF(!mGetAll, mLimit == 1);
AUTO_PROFILER_LABEL("IndexGetRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("IndexGetRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -27406,7 +27406,7 @@ IndexGetKeyRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
OptionalKeyRange::TSerializedKeyRange);
MOZ_ASSERT_IF(!mGetAll, mLimit == 1);
AUTO_PROFILER_LABEL("IndexGetKeyRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("IndexGetKeyRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -27517,7 +27517,7 @@ IndexCountRequestOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(aConnection);
aConnection->AssertIsOnConnectionThread();
AUTO_PROFILER_LABEL("IndexCountRequestOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("IndexCountRequestOp::DoDatabaseWork", DOM);
const bool hasKeyRange =
mParams.optionalKeyRange().type() == OptionalKeyRange::TSerializedKeyRange;
@ -27803,7 +27803,7 @@ OpenOp::DoObjectStoreDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(mCursor->mObjectStoreId);
MOZ_ASSERT(mCursor->mFileManager);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoObjectStoreDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoObjectStoreDatabaseWork", DOM);
const bool usingKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -27961,7 +27961,7 @@ OpenOp::DoObjectStoreKeyDatabaseWork(DatabaseConnection* aConnection)
OpenCursorParams::TObjectStoreOpenKeyCursorParams);
MOZ_ASSERT(mCursor->mObjectStoreId);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoObjectStoreKeyDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoObjectStoreKeyDatabaseWork", DOM);
const bool usingKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -28117,7 +28117,7 @@ OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(mCursor->mObjectStoreId);
MOZ_ASSERT(mCursor->mIndexId);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexDatabaseWork", DOM);
const bool usingKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -28364,7 +28364,7 @@ OpenOp::DoIndexKeyDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(mCursor->mObjectStoreId);
MOZ_ASSERT(mCursor->mIndexId);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexKeyDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexKeyDatabaseWork", DOM);
const bool usingKeyRange =
mOptionalKeyRange.type() == OptionalKeyRange::TSerializedKeyRange;
@ -28604,7 +28604,7 @@ OpenOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT(mCursor->mKey.IsUnset());
MOZ_ASSERT(mCursor->mRangeKey.IsUnset());
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::OpenOp::DoDatabaseWork", DOM);
nsresult rv;
@ -28688,7 +28688,7 @@ ContinueOp::DoDatabaseWork(DatabaseConnection* aConnection)
MOZ_ASSERT_IF(isIndex, mCursor->mIndexId);
MOZ_ASSERT_IF(isIndex, !mCursor->mObjectKey.IsUnset());
AUTO_PROFILER_LABEL("Cursor::ContinueOp::DoDatabaseWork", STORAGE);
AUTO_PROFILER_LABEL("Cursor::ContinueOp::DoDatabaseWork", DOM);
// We need to pick a query based on whether or not a key was passed to the
// continue function. If not we'll grab the the next item in the database that
@ -29475,7 +29475,7 @@ FileHelper::SyncCopy(nsIInputStream* aInputStream,
MOZ_ASSERT(aInputStream);
MOZ_ASSERT(aOutputStream);
AUTO_PROFILER_LABEL("FileHelper::SyncCopy", STORAGE);
AUTO_PROFILER_LABEL("FileHelper::SyncCopy", DOM);
nsresult rv;

2
dom/storage/StorageDBThread.cpp
Просмотреть файл

@ -333,7 +333,7 @@ StorageDBThread::Shutdown()
void
StorageDBThread::SyncPreload(LocalStorageCacheBridge* aCache, bool aForceSync)
{
AUTO_PROFILER_LABEL("StorageDBThread::SyncPreload", STORAGE);
AUTO_PROFILER_LABEL("StorageDBThread::SyncPreload", OTHER);
if (!aForceSync && aCache->LoadedCount()) {
// Preload already started for this cache, just wait for it to finish.
// LoadWait will exit after LoadDone on the cache has been called.

3
js/public/ProfilingStack.h
Просмотреть файл

@ -197,10 +197,9 @@ class ProfilingStackFrame
NETWORK,
GRAPHICS,
DOM,
STORAGE,
FIRST = OTHER,
LAST = STORAGE,
LAST = DOM,
};
static_assert(uint32_t(Category::LAST) <= (UINT32_MAX >> uint32_t(Kind::KIND_BITCOUNT)),

10
storage/mozStorageConnection.cpp
Просмотреть файл

@ -672,7 +672,7 @@ Connection::initialize()
{
NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
MOZ_ASSERT(!mIgnoreLockingMode, "Can't ignore locking on an in-memory db.");
AUTO_PROFILER_LABEL("Connection::initialize", STORAGE);
AUTO_PROFILER_LABEL("Connection::initialize", OTHER);
// in memory database requested, sqlite uses a magic file name
int srv = ::sqlite3_open_v2(":memory:", &mDBConn, mFlags, GetVFSName());
@ -695,7 +695,7 @@ Connection::initialize(nsIFile *aDatabaseFile)
{
NS_ASSERTION (aDatabaseFile, "Passed null file!");
NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
AUTO_PROFILER_LABEL("Connection::initialize", STORAGE);
AUTO_PROFILER_LABEL("Connection::initialize", OTHER);
mDatabaseFile = aDatabaseFile;
@ -732,7 +732,7 @@ Connection::initialize(nsIFileURL *aFileURL)
{
NS_ASSERTION (aFileURL, "Passed null file URL!");
NS_ASSERTION (!mDBConn, "Initialize called on already opened database!");
AUTO_PROFILER_LABEL("Connection::initialize", STORAGE);
AUTO_PROFILER_LABEL("Connection::initialize", OTHER);
nsCOMPtr<nsIFile> databaseFile;
nsresult rv = aFileURL->GetFile(getter_AddRefs(databaseFile));
@ -1495,7 +1495,7 @@ NS_IMETHODIMP
Connection::AsyncClone(bool aReadOnly,
mozIStorageCompletionCallback *aCallback)
{
AUTO_PROFILER_LABEL("Connection::AsyncClone", STORAGE);
AUTO_PROFILER_LABEL("Connection::AsyncClone", OTHER);
NS_ENSURE_TRUE(NS_IsMainThread(), NS_ERROR_NOT_SAME_THREAD);
if (!mDBConn)
@ -1683,7 +1683,7 @@ Connection::Clone(bool aReadOnly,
{
MOZ_ASSERT(threadOpenedOn == NS_GetCurrentThread());
AUTO_PROFILER_LABEL("Connection::Clone", STORAGE);
AUTO_PROFILER_LABEL("Connection::Clone", OTHER);
if (!mDBConn)
return NS_ERROR_NOT_INITIALIZED;

2
storage/mozStorageStatement.cpp
Просмотреть файл

@ -554,7 +554,7 @@ Statement::Execute()
NS_IMETHODIMP
Statement::ExecuteStep(bool *_moreResults)
{
AUTO_PROFILER_LABEL("Statement::ExecuteStep", STORAGE);
AUTO_PROFILER_LABEL("Statement::ExecuteStep", OTHER);
if (!mDBStatement)
return NS_ERROR_NOT_INITIALIZED;

2
tools/profiler/tests/gtest/GeckoProfiler.cpp
Просмотреть файл

@ -695,7 +695,7 @@ TEST(GeckoProfiler, ProfilingStack)
}
AutoProfilerLabel label1("A", nullptr, 888,
js::ProfilingStackFrame::Category::STORAGE);
js::ProfilingStackFrame::Category::DOM);
AutoProfilerLabel label2("A", dynamic.get(), 888,
js::ProfilingStackFrame::Category::NETWORK);
ASSERT_TRUE(profiler_get_backtrace());