wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-25 00:27:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

[network] cache memory reporter cleanup

Browse source
This commit is contained in:
Moonchild 2022-02-11 13:20:09 +00:00 • committed by roytam1
commit 232f5a4705
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
netwerk/cache2/CacheIndex.cpp
View file

@ -3649,7 +3649,7 @@ CacheIndex::SizeOfExcludingThisInternal(mozilla::MallocSizeOf mallocSizeOf) cons
size_t size_t
CacheIndex::SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) CacheIndex::SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf)
{ {
sLock.AssertCurrentThreadOwns(); StaticMutexAutoLock lock(sLock);
if (!gInstance) if (!gInstance)
return 0; return 0;
@ -3663,7 +3663,8 @@ CacheIndex::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf)
{ {
StaticMutexAutoLock lock(sLock); StaticMutexAutoLock lock(sLock);
return mallocSizeOf(gInstance) + SizeOfExcludingThis(mallocSizeOf); return mallocSizeOf(gInstance) +
(gInstance ? gInstance->SizeOfExcludingThisInternal(mallocSizeOf) : 0);
} }
// static // static

4
netwerk/cache2/CacheStorageService.cpp
View file

@ -2031,6 +2031,8 @@ NS_IMETHODIMP
CacheStorageService::CollectReports(nsIHandleReportCallback* aHandleReport, CacheStorageService::CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) nsISupports* aData, bool aAnonymize)
{ {
MutexAutoLock lock(mLock);
MOZ_COLLECT_REPORT( MOZ_COLLECT_REPORT(
"explicit/network/cache2/io", KIND_HEAP, UNITS_BYTES, "explicit/network/cache2/io", KIND_HEAP, UNITS_BYTES,
CacheFileIOManager::SizeOfIncludingThis(MallocSizeOf), CacheFileIOManager::SizeOfIncludingThis(MallocSizeOf),
@ -2041,8 +2043,6 @@ CacheStorageService::CollectReports(nsIHandleReportCallback* aHandleReport,
CacheIndex::SizeOfIncludingThis(MallocSizeOf), CacheIndex::SizeOfIncludingThis(MallocSizeOf),
"Memory used by the cache index."); "Memory used by the cache index.");
MutexAutoLock lock(mLock);
// Report the service instance, this doesn't report entries, done lower // Report the service instance, this doesn't report entries, done lower
MOZ_COLLECT_REPORT( MOZ_COLLECT_REPORT(
"explicit/network/cache2/service", KIND_HEAP, UNITS_BYTES, "explicit/network/cache2/service", KIND_HEAP, UNITS_BYTES,