nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1829029: clean up memory reporting for CacheFileIOManager r=necko-reviewers,valentin, a=RyanVM

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D221350
This commit is contained in:
Randell Jesup 2024-09-09 14:14:01 +00:00
parent 74692f6658
commit bf1ac7c5ba
1 changed files with 13 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
netwerk/cache2/CacheFileIOManager.cpp
View file

@ -4411,13 +4411,15 @@ class SizeOfHandlesRunnable : public Runnable {
public:
SizeOfHandlesRunnable(mozilla::MallocSizeOf mallocSizeOf,
CacheFileHandles const& handles,
nsTArray<CacheFileHandle*> const& specialHandles)
nsTArray<CacheFileHandle*> const& specialHandles,
nsCOMPtr<nsITimer> const& metadataWritesTimer)
: Runnable("net::SizeOfHandlesRunnable"),
mMonitor("SizeOfHandlesRunnable.mMonitor"),
mMonitorNotified(false),
mMallocSizeOf(mallocSizeOf),
mHandles(handles),
mSpecialHandles(specialHandles),
mMetadataWritesTimer(metadataWritesTimer),
mSize(0) {}
size_t Get(CacheIOThread* thread) {
@ -4449,6 +4451,10 @@ class SizeOfHandlesRunnable : public Runnable {
for (uint32_t i = 0; i < mSpecialHandles.Length(); ++i) {
mSize += mSpecialHandles[i]->SizeOfIncludingThis(mMallocSizeOf);
}
nsCOMPtr<nsISizeOf> sizeOf = do_QueryInterface(mMetadataWritesTimer);
if (sizeOf) {
mSize += sizeOf->SizeOfIncludingThis(mMallocSizeOf);
}
mMonitorNotified = true;
mon.Notify();
@ -4456,11 +4462,12 @@ class SizeOfHandlesRunnable : public Runnable {
}
private:
mozilla::Monitor mMonitor MOZ_UNANNOTATED;
mozilla::Monitor mMonitor;
bool mMonitorNotified;
mozilla::MallocSizeOf mMallocSizeOf;
CacheFileHandles const& mHandles;
nsTArray<CacheFileHandle*> const& mSpecialHandles;
nsCOMPtr<nsITimer> const& mMetadataWritesTimer;
size_t mSize;
};
@ -4474,10 +4481,11 @@ size_t CacheFileIOManager::SizeOfExcludingThisInternal(
if (mIOThread) {
n += mIOThread->SizeOfIncludingThis(mallocSizeOf);
// mHandles and mSpecialHandles must be accessed only on the I/O thread,
// must sync dispatch.
// mHandles, mSpecialHandles and mMetadataWritesTimer must be accessed
// only on the I/O thread, must sync dispatch.
RefPtr<SizeOfHandlesRunnable> sizeOfHandlesRunnable =
new SizeOfHandlesRunnable(mallocSizeOf, mHandles, mSpecialHandles);
new SizeOfHandlesRunnable(mallocSizeOf, mHandles, mSpecialHandles,
mMetadataWritesTimer);
n += sizeOfHandlesRunnable->Get(mIOThread);
}
@ -4486,9 +4494,6 @@ size_t CacheFileIOManager::SizeOfExcludingThisInternal(
sizeOf = do_QueryInterface(mCacheDirectory);
if (sizeOf) n += sizeOf->SizeOfIncludingThis(mallocSizeOf);
sizeOf = do_QueryInterface(mMetadataWritesTimer);
if (sizeOf) n += sizeOf->SizeOfIncludingThis(mallocSizeOf);
sizeOf = do_QueryInterface(mTrashTimer);
if (sizeOf) n += sizeOf->SizeOfIncludingThis(mallocSizeOf);