corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1913561 - Remove QuotaManager::EnsureTemporaryStorageIsInitializedInternal calls from places where a directory lock is obtained via QuotaManager::OpenStorageDirectory; r=dom-storage-reviewers,jari

Browse Source 
QuotaManager::OpenStorageDirectory already makes sure that temporary storage
is initialized so all these calls are now redundant.

Differential Revision: https://phabricator.services.mozilla.com/D195395
This commit is contained in:
Jan Varga
2024-10-07 10:25:01 +00:00
parent f8a42a3842
commit f504456106
2 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
dom/indexedDB/ActorsParent.cpp
View File

@@ -5050,6 +5050,7 @@ class Maintenance final : public Runnable {
nsTHashMap<nsStringHashKey, DatabaseMaintenance*> mDatabaseMaintenances;
nsresult mResultCode;
Atomic<bool> mAborted;
bool mInitializeOriginsFailed;
State mState;
public:
@@ -5059,6 +5060,7 @@ class Maintenance final : public Runnable {
mStartTime(PR_Now()),
mResultCode(NS_OK),
mAborted(false),
mInitializeOriginsFailed(false),
mState(State::Initial) {
AssertIsOnBackgroundThread();
MOZ_ASSERT(aQuotaClient);
@@ -5126,6 +5128,9 @@ class Maintenance final : public Runnable {
// dispatch to the PBackground thread on which OpenDirectory() is called.
nsresult CreateIndexedDatabaseManager();
RefPtr<UniversalDirectoryLockPromise> OpenStorageDirectory(
bool aInitializeOrigins);
// Runs on the PBackground thread. Once QuotaManager has given a lock it will
// call DirectoryOpen().
nsresult OpenDirectory();
@@ -13021,6 +13026,25 @@ nsresult Maintenance::CreateIndexedDatabaseManager() {
return NS_OK;
}
RefPtr<UniversalDirectoryLockPromise> Maintenance::OpenStorageDirectory(
bool aInitializeOrigins) {
AssertIsOnBackgroundThread();
MOZ_ASSERT(!QuotaClient::IsShuttingDownOnBackgroundThread());
MOZ_ASSERT(!mDirectoryLock);
MOZ_ASSERT(!mAborted);
MOZ_ASSERT(mState == State::DirectoryOpenPending);
QuotaManager* quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
// Return a shared lock for <profile>/storage/*/*/idb
return quotaManager->OpenStorageDirectory(
PersistenceScope::CreateFromNull(), OriginScope::FromNull(),
Nullable<Client::Type>(Client::IDB),
/* aExclusive */ false, aInitializeOrigins, DirectoryLockCategory::None,
SomeRef(mPendingDirectoryLock));
}
nsresult Maintenance::OpenDirectory() {
AssertIsOnBackgroundThread();
MOZ_ASSERT(mState == State::Initial ||
@@ -13033,29 +13057,46 @@ nsresult Maintenance::OpenDirectory() {
return NS_ERROR_ABORT;
}
QuotaManager* quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
// Get a shared lock for <profile>/storage/*/*/idb
mState = State::DirectoryOpenPending;
quotaManager
->OpenStorageDirectory(
PersistenceScope::CreateFromNull(), OriginScope::FromNull(),
Nullable<Client::Type>(Client::IDB), /* aExclusive */ false,
/* aInitializeOrigins */ false, DirectoryLockCategory::None,
SomeRef(mPendingDirectoryLock))
->Then(GetCurrentSerialEventTarget(), __func__,
[self = RefPtr(this)](
const UniversalDirectoryLockPromise::ResolveOrRejectValue&
aValue) {
if (aValue.IsResolve()) {
self->DirectoryLockAcquired(aValue.ResolveValue());
} else {
self->DirectoryLockFailed();
}
});
// Since idle maintenance may occur before temporary storage is initialized,
// make sure it's initialized here (all non-persistent origins need to be
// cleaned up and quota info needs to be loaded for them).
OpenStorageDirectory(/* aInitializeOrigins */ true)
->Then(
GetCurrentSerialEventTarget(), __func__,
[self = RefPtr(this)](
const UniversalDirectoryLockPromise::ResolveOrRejectValue&
aValue) {
if (aValue.IsResolve()) {
self->DirectoryLockAcquired(aValue.ResolveValue());
return;
}
// Don't fail whole idle maintenance in case of an error, the
// persistent repository can still be processed.
self->mPendingDirectoryLock = nullptr;
self->mInitializeOriginsFailed = true;
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) ||
self->IsAborted()) {
self->DirectoryLockFailed();
return;
}
self->OpenStorageDirectory(/* aInitializeOrigins */ false)
->Then(GetCurrentSerialEventTarget(), __func__,
[self](const UniversalDirectoryLockPromise::
ResolveOrRejectValue& aValue) {
if (aValue.IsResolve()) {
self->DirectoryLockAcquired(aValue.ResolveValue());
} else {
self->DirectoryLockFailed();
}
});
});
return NS_OK;
}
@@ -13101,20 +13142,6 @@ nsresult Maintenance::DirectoryWork() {
QuotaManager* const quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
// Since idle maintenance may occur before temporary storage is initialized,
// make sure it's initialized here (all non-persistent origins need to be
// cleaned up and quota info needs to be loaded for them).
// Don't fail whole idle maintenance in case of an error, the persistent
// repository can still
// be processed.
const bool initTemporaryStorageFailed = [&quotaManager] {
QM_TRY(MOZ_TO_RESULT(
quotaManager->EnsureTemporaryStorageIsInitializedInternal()),
true);
return false;
}();
const nsCOMPtr<nsIFile> storageDir =
GetFileForPath(quotaManager->GetStoragePath());
QM_TRY(OkIf(storageDir), NS_ERROR_FAILURE);
@@ -13164,7 +13191,7 @@ nsresult Maintenance::DirectoryWork() {
const bool persistent = persistenceType == PERSISTENCE_TYPE_PERSISTENT;
if (!persistent && initTemporaryStorageFailed) {
if (!persistent && mInitializeOriginsFailed) {
// Non-persistent (best effort) repositories can't be processed if
// temporary storage initialization failed.
continue;

19
dom/quota/OriginOperations.cpp
View File

@@ -1931,7 +1931,8 @@ RefPtr<BoolPromise> GetFullOriginMetadataOp::OpenDirectory() {
PersistenceScope::CreateFromValue(mOriginMetadata.mPersistenceType),
OriginScope::FromOrigin(mOriginMetadata.mOrigin),
Nullable<Client::Type>(),
/* aExclusive */ false);
/* aExclusive */ false,
/* aInitializeOrigins */ true);
}
nsresult GetFullOriginMetadataOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
@@ -1940,12 +1941,6 @@ nsresult GetFullOriginMetadataOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
AUTO_PROFILER_LABEL("GetFullOriginMetadataOp::DoDirectoryWork", OTHER);
// Ensure temporary storage is initialized. If temporary storage hasn't
// been initialized yet, the method will initialize it by traversing the
// repositories for temporary and default storage (including our origin).
QM_TRY(MOZ_TO_RESULT(
aQuotaManager.EnsureTemporaryStorageIsInitializedInternal()));
// Get metadata cached in memory (the method doesn't have to stat any
// files).
mMaybeFullOriginMetadata =
@@ -2781,7 +2776,8 @@ RefPtr<BoolPromise> EstimateOp::OpenDirectory() {
PERSISTENCE_TYPE_PRIVATE),
OriginScope::FromOrigin(mOriginMetadata.mOrigin),
Nullable<Client::Type>(),
/* aExclusive */ false);
/* aExclusive */ false,
/* aInitializeOrigins */ true);
}
nsresult EstimateOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
@@ -2790,13 +2786,6 @@ nsresult EstimateOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
AUTO_PROFILER_LABEL("EstimateOp::DoDirectoryWork", OTHER);
// Ensure temporary storage is initialized. If temporary storage hasn't been
// initialized yet, the method will initialize it by traversing the
// repositories for temporary and default storage (including origins
// belonging to our group).
QM_TRY(MOZ_TO_RESULT(
aQuotaManager.EnsureTemporaryStorageIsInitializedInternal()));
// Get cached usage (the method doesn't have to stat any files).
mUsageAndLimit = aQuotaManager.GetUsageAndLimitForEstimate(mOriginMetadata);