Commit 1a683566 authored by Randell Jesup's avatar Randell Jesup Committed by Pier Angelo Vendrame
Browse files

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

Differential Revision: https://phabricator.services.mozilla.com/D221350
parent fb76ec18

netwerk/cache2/CacheFileIOManager.cpp

+13 −8
Original line number Diff line number Diff line
@@ -4359,13 +4359,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) {
@@ -4397,6 +4399,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();
@@ -4404,11 +4410,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;

};
@@ -4422,10 +4429,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);

  }
@@ -4434,9 +4442,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);