Changeset 219249 in webkit

Timestamp:

Jul 7, 2017 12:22:12 AM (7 years ago)

Author:

Antti Koivisto

Message:

WKWebSiteDataStore.removeDataOfTypes should wait until disk cache files are actually removed before invoking completion handler
​https://bugs.webkit.org/show_bug.cgi?id=174224
<rdar://problem/33067545>

Reviewed by Sam Weinig.

Currently we dispatch file deletion operations to a background queue and call the completion
handler without waiting for the I/O to complete.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::clearDiskCacheEntries):

Call a new version of NetworkCache::remove() for bulk deletion.
Note that it is fine to call this with an empty vector.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::remove):

Bulk deletion with a completion handler.

(WebKit::NetworkCache::Cache::deleteFiles): Added.

Factor to a helper function.

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

(WebKit::NetworkCache::Storage::remove):

Remove files for all the provided keys in a queue and invoke the completion handler in the main thread when done.

• NetworkProcess/cache/NetworkCacheStorage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCache.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-07  Antti Koivisto  <antti@apple.com>
+
+        WKWebSiteDataStore.removeDataOfTypes should wait until disk cache files are actually removed before invoking completion handler
+        https://bugs.webkit.org/show_bug.cgi?id=174224
+        <rdar://problem/33067545>
+
+        Reviewed by Sam Weinig.
+
+        Currently we dispatch file deletion operations to a background queue and call the completion
+        handler without waiting for the I/O to complete.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::clearDiskCacheEntries):
+
+            Call a new version of NetworkCache::remove() for bulk deletion.
+            Note that it is fine to call this with an empty vector.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::remove):
+
+            Bulk deletion with a completion handler.
+
+        (WebKit::NetworkCache::Cache::deleteFiles): Added.
+
+            Factor to a helper function.
+
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::remove):
+
+            Remove files for all the provided keys in a queue and invoke the completion handler in the main thread when done.
+
+        * NetworkProcess/cache/NetworkCacheStorage.h:
+
 2017-07-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -450 +450 @@
             }
 
-            for (auto& key : cacheKeysToDelete)
-                NetworkCache::singleton().remove(key);
-
-            RunLoop::main().dispatch(WTFMove(completionHandler));
+            NetworkCache::singleton().remove(cacheKeysToDelete, WTFMove(completionHandler));
             return;
         });

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

@@ -504 +504 @@
 {
     remove(makeCacheKey(request));
+}
+
+void Cache::remove(const Vector<Key>& keys, Function<void ()>&& completionHandler)
+{
+    ASSERT(isEnabled());
+
+    m_storage->remove(keys, WTFMove(completionHandler));
 }
 

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

@@ -122 +122 @@
     void remove(const Key&);
     void remove(const WebCore::ResourceRequest&);
+    void remove(const Vector<Key>&, Function<void ()>&&);
 
     void clear();

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

@@ -556 +556 @@
 
     serialBackgroundIOQueue().dispatch([this, key] {
-        WebCore::deleteFile(recordPathForKey(key));
-        m_blobStorage.remove(blobPathForKey(key));
-    });
+        deleteFiles(key);
+    });
+}
+
+void Storage::remove(const Vector<Key>& keys, Function<void ()>&& completionHandler)
+{
+    ASSERT(RunLoop::isMain());
+
+    Vector<Key> keysToRemove;
+    keysToRemove.reserveInitialCapacity(keys.size());
+
+    for (auto& key : keys) {
+        if (!mayContain(key))
+            continue;
+        removeFromPendingWriteOperations(key);
+        keysToRemove.uncheckedAppend(key);
+    }
+
+    serialBackgroundIOQueue().dispatch([this, keysToRemove = WTFMove(keysToRemove), completionHandler = WTFMove(completionHandler)] () mutable {
+        for (auto& key : keysToRemove)
+            deleteFiles(key);
+
+        if (completionHandler)
+            RunLoop::main().dispatch(WTFMove(completionHandler));
+    });
+}
+
+void Storage::deleteFiles(const Key& key)
+{
+    ASSERT(!RunLoop::isMain());
+
+    WebCore::deleteFile(recordPathForKey(key));
+    m_blobStorage.remove(blobPathForKey(key));
 }
 

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

@@ -69 +69 @@
 
     void remove(const Key&);
+    void remove(const Vector<Key>&, Function<void ()>&&);
     void clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, Function<void ()>&& completionHandler);
 
@@ -144 +145 @@
 
     void addToRecordFilter(const Key&);
+    void deleteFiles(const Key&);
 
     const String m_basePath;