Bug 1645052 - Do not store number of bytes written to the cache in preferences, r=valentin,necko-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D88488

Author: vonasek

netwerk/cache2/CacheIndex.cpp

@@ -24,7 +24,7 @@
 #define kMinUnwrittenChanges 300
 #define kMinDumpInterval 20000  // in milliseconds
 #define kMaxBufSize 16384
-#define kIndexVersion 0x00000009
+#define kIndexVersion 0x0000000A
 #define kUpdateIndexStartDelay 50000  // in milliseconds
 #define kTelemetryReportBytesLimit (2U * 1024U * 1024U * 1024U)  // 2GB
 
@@ -305,9 +305,6 @@ nsresult CacheIndex::InitInternal(nsIFile* aCacheDirectory) {
 
   mStartTime = TimeStamp::NowLoRes();
 
-  mTotalBytesWritten = CacheObserver::CacheAmountWritten();
-  mTotalBytesWritten <<= 10;
-
   ReadIndexFromDisk();
 
   return NS_OK;
@@ -425,8 +422,6 @@ nsresult CacheIndex::Shutdown() {
 
   bool sanitize = CacheObserver::ClearCacheOnShutdown();
 
-  CacheObserver::SetCacheAmountWritten(index->mTotalBytesWritten >> 10);
-
   LOG(
       ("CacheIndex::Shutdown() - [state=%d, indexOnDiskIsValid=%d, "
        "dontMarkIndexClean=%d, sanitize=%d]",
@@ -1718,6 +1713,10 @@ void CacheIndex::WriteIndexToDisk() {
   // dirty flag
   NetworkEndian::writeUint32(mRWBuf + mRWBufPos, 1);
   mRWBufPos += sizeof(uint32_t);
+  // amount of data written to the cache
+  NetworkEndian::writeUint32(mRWBuf + mRWBufPos,
+                             static_cast<uint32_t>(mTotalBytesWritten >> 10));
+  mRWBufPos += sizeof(uint32_t);
 
   mSkipEntries = 0;
 }
@@ -2199,6 +2198,11 @@ void CacheIndex::ParseRecords() {
       }
     }
     pos += sizeof(uint32_t);
+
+    uint64_t dataWritten = NetworkEndian::readUint32(mRWBuf + pos);
+    pos += sizeof(uint32_t);
+    dataWritten <<= 10;
+    mTotalBytesWritten += dataWritten;
   }
 
   uint32_t hashOffset = pos;
@@ -3888,17 +3892,9 @@ void CacheIndex::UpdateTotalBytesWritten(uint32_t aBytesWritten) {
       index->mState == READY && !index->mIndexNeedsUpdate &&
       !index->mShuttingDown) {
     index->DoTelemetryReport();
-
     index->mTotalBytesWritten = 0;
-    CacheObserver::SetCacheAmountWritten(0);
     return;
   }
-
-  uint64_t writtenKB = index->mTotalBytesWritten >> 10;
-  // Store number of written kilobytes to prefs after writing at least 10MB.
-  if ((writtenKB - CacheObserver::CacheAmountWritten()) > (10 * 1024)) {
-    CacheObserver::SetCacheAmountWritten(writtenKB);
-  }
 }
 
 void CacheIndex::DoTelemetryReport() {

netwerk/cache2/CacheIndex.h

@@ -58,11 +58,17 @@ typedef struct {
   // journal and start update process whenever this flag is set during index
   // parsing.
   uint32_t mIsDirty;
+
+  // The amount of data written to the cache. When it reaches
+  // kTelemetryReportBytesLimit a telemetry report is sent and the counter is
+  // reset.
+  uint32_t mKBWritten;
 } CacheIndexHeader;
 
 static_assert(sizeof(CacheIndexHeader::mVersion) +
                       sizeof(CacheIndexHeader::mTimeStamp) +
-                      sizeof(CacheIndexHeader::mIsDirty) ==
+                      sizeof(CacheIndexHeader::mIsDirty) +
+                      sizeof(CacheIndexHeader::mKBWritten) ==
                   sizeof(CacheIndexHeader),
               "Unexpected sizeof(CacheIndexHeader)!");
 

netwerk/cache2/CacheObserver.cpp

@@ -44,10 +44,6 @@ bool CacheObserver::sHashStatsReported = kDefaultHashStatsReported;
 Atomic<PRIntervalTime> CacheObserver::sShutdownDemandedTime(
     PR_INTERVAL_NO_TIMEOUT);
 
-static uint32_t const kDefaultCacheAmountWritten = 0;
-Atomic<uint32_t, Relaxed> CacheObserver::sCacheAmountWritten(
-    kDefaultCacheAmountWritten);
-
 NS_IMPL_ISUPPORTS(CacheObserver, nsIObserver, nsISupportsWeakReference)
 
 // static
@@ -97,10 +93,6 @@ void CacheObserver::AttachToPreferences() {
       0.01F, std::min(1440.0F, mozilla::Preferences::GetFloat(
                                    "browser.cache.frecency_half_life_hours",
                                    kDefaultHalfLifeHours)));
-
-  mozilla::Preferences::AddAtomicUintVarCache(
-      &sCacheAmountWritten, "browser.cache.disk.amount_written",
-      kDefaultCacheAmountWritten);
 }
 
 // static
@@ -194,29 +186,6 @@ void CacheObserver::StoreHashStatsReported() {
                                sHashStatsReported);
 }
 
-// static
-void CacheObserver::SetCacheAmountWritten(uint32_t aCacheAmountWritten) {
-  sCacheAmountWritten = aCacheAmountWritten;
-
-  if (!sSelf) {
-    return;
-  }
-
-  if (NS_IsMainThread()) {
-    sSelf->StoreCacheAmountWritten();
-  } else {
-    nsCOMPtr<nsIRunnable> event =
-        NewRunnableMethod("net::CacheObserver::StoreCacheAmountWritten",
-                          sSelf.get(), &CacheObserver::StoreCacheAmountWritten);
-    NS_DispatchToMainThread(event);
-  }
-}
-
-void CacheObserver::StoreCacheAmountWritten() {
-  mozilla::Preferences::SetInt("browser.cache.disk.amount_written",
-                               sCacheAmountWritten);
-}
-
 // static
 void CacheObserver::ParentDirOverride(nsIFile** aDir) {
   if (NS_WARN_IF(!aDir)) return;

netwerk/cache2/CacheObserver.h

@@ -79,11 +79,6 @@ class CacheObserver : public nsIObserver, public nsSupportsWeakReference {
   static void SetCacheFSReported();
   static bool HashStatsReported() { return sHashStatsReported; }
   static void SetHashStatsReported();
-  static uint32_t CacheAmountWritten()  // result in kilobytes
-  {
-    return sCacheAmountWritten;
-  }
-  static void SetCacheAmountWritten(uint32_t);  // parameter in kilobytes.
   static void ParentDirOverride(nsIFile** aDir);
 
   static bool EntryIsTooBig(int64_t aSize, bool aUsingDisk);
@@ -102,7 +97,6 @@ class CacheObserver : public nsIObserver, public nsSupportsWeakReference {
 
   void StoreCacheFSReported();
   void StoreHashStatsReported();
-  void StoreCacheAmountWritten();
   void AttachToPreferences();
 
   static int32_t sAutoMemoryCacheCapacity;
@@ -111,7 +105,6 @@ class CacheObserver : public nsIObserver, public nsSupportsWeakReference {
   static bool sCacheFSReported;
   static bool sHashStatsReported;
   static Atomic<PRIntervalTime> sShutdownDemandedTime;
-  static Atomic<uint32_t, Relaxed> sCacheAmountWritten;
 
   // Non static properties, accessible via sSelf
   nsCOMPtr<nsIFile> mCacheParentDirectoryOverride;