Changeset 180947 in webkit

Timestamp:

Mar 3, 2015 12:10:07 PM (9 years ago)

Author:

Antti Koivisto

Message:

Cache shrink leaves behind empty partition directories
​https://bugs.webkit.org/show_bug.cgi?id=142217

Reviewed by Andreas Kling.

• NetworkProcess/cache/NetworkCacheFileSystemPosix.h:

(WebKit::traverseCacheFiles):

No need for std::function.

• NetworkProcess/cache/NetworkCacheStorageCocoa.mm:

(WebKit::NetworkCacheStorage::shrinkIfNeeded):

After shrink traverse through the partition directories and try to delete them.
System knows if they are actually empty.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheFileSystemPosix.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorageCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-03  Antti Koivisto  <antti@apple.com>
+
+        Cache shrink leaves behind empty partition directories
+        https://bugs.webkit.org/show_bug.cgi?id=142217
+
+        Reviewed by Andreas Kling.
+
+        * NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
+        (WebKit::traverseCacheFiles):
+
+            No need for std::function.
+
+        * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+        (WebKit::NetworkCacheStorage::shrinkIfNeeded):
+
+            After shrink traverse through the partition directories and try to delete them.
+            System knows if they are actually empty.
+
 2015-03-03  Anders Carlsson  <andersca@apple.com>
 

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

@@ -54 +54 @@
 }
 
-inline void traverseCacheFiles(const String& cachePath, std::function<void (const String& fileName, const String& partitionPath)> function)
+template <typename Function>
+inline void traverseCacheFiles(const String& cachePath, const Function& function)
 {
     traverseDirectory(cachePath, DT_DIR, [&cachePath, &function](const String& subdirName) {

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm

@@ -696 +696 @@
             });
         });
+
+        // Let system figure out if they are really empty.
+        traverseDirectory(cachePath, DT_DIR, [&cachePath](const String& subdirName) {
+            auto partitionPath = WebCore::pathByAppendingComponent(cachePath, subdirName);
+            WebCore::deleteEmptyDirectory(partitionPath);
+        });
+
         m_shrinkInProgress = false;