Changeset 182983 in webkit

Timestamp:

Apr 18, 2015, 7:42:08 AM (10 years ago)

Author:

Chris Dumez

Message:

Fix NetworkCache Statistics database bootstrapping after r182803
​https://bugs.webkit.org/show_bug.cgi?id=143890

Reviewed by Darin Adler.

Update the NetworkCache Statistics database bootstrapping code to use
the records path instead of the version path. Also check that the
filenames in the folder are valid hashes to discard the *-body files.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::recordsPath):
(WebKit::NetworkCache::Cache::storagePath): Deleted.

• NetworkProcess/cache/NetworkCache.h:
• NetworkProcess/cache/NetworkCacheStatistics.cpp:

(WebKit::NetworkCache::Statistics::initialize):
(WebKit::NetworkCache::Statistics::bootstrapFromNetworkCache):
(WebKit::NetworkCache::Statistics::shrinkIfNeeded):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStatistics.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-18  Chris Dumez  <cdumez@apple.com>
+
+        Fix NetworkCache Statistics database bootstrapping after r182803
+        https://bugs.webkit.org/show_bug.cgi?id=143890
+
+        Reviewed by Darin Adler.
+
+        Update the NetworkCache Statistics database bootstrapping code to use
+        the records path instead of the version path. Also check that the
+        filenames in the folder are valid hashes to discard the *-body files.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::recordsPath):
+        (WebKit::NetworkCache::Cache::storagePath): Deleted.
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+        (WebKit::NetworkCache::Statistics::initialize):
+        (WebKit::NetworkCache::Statistics::bootstrapFromNetworkCache):
+        (WebKit::NetworkCache::Statistics::shrinkIfNeeded):
+
 2015-04-17  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp

@@ -498 +498 @@
 }
 
-String Cache::storagePath() const
-{
-    return m_storage ? m_storage->versionPath() : String();
-}
-
-}
-}
-
-#endif
+String Cache::recordsPath() const
+{
+    return m_storage ? m_storage->recordsPath() : String();
+}
+
+}
+}
+
+#endif

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h

@@ -104 +104 @@
     void dumpContentsToFile();
 
-    String storagePath() const;
+    String recordsPath() const;
 
 private:

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp

@@ -96 +96 @@
 
     StringCapture databasePathCapture(databasePath);
-    StringCapture networkCachePathCapture(singleton().storagePath());
+    StringCapture networkCachePathCapture(singleton().recordsPath());
     serialBackgroundIOQueue().dispatch([this, databasePathCapture, networkCachePathCapture, startTime] {
         WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
@@ -145 +145 @@
 
     Vector<StringCapture> hashes;
-    traverseCacheFiles(networkCachePath, [&hashes](const String& hash, const String&) {
-        hashes.append(hash);
+    traverseCacheFiles(networkCachePath, [&hashes](const String& hashString, const String&) {
+        Key::HashType hash;
+        if (!Key::stringToHash(hashString, hash))
+            return;
+
+        hashes.append(hashString);
     });
 
@@ -170 +174 @@
     clear();
 
-    StringCapture networkCachePathCapture(singleton().storagePath());
+    StringCapture networkCachePathCapture(singleton().recordsPath());
     serialBackgroundIOQueue().dispatch([this, networkCachePathCapture] {
         bootstrapFromNetworkCache(networkCachePathCapture.string());