Changeset 244162 in webkit

Timestamp:

Apr 10, 2019, 3:59:14 PM (7 years ago)

Author:

youenn@apple.com

Message:

Clear Cache Storage structures before removing all related files
​https://bugs.webkit.org/show_bug.cgi?id=196650

Reviewed by Alex Christensen.

Previously, we were clearing files in parallel to clearing the internal CacheStorage structures.
To make things more deterministic, clear files/folders directly
after CachesStorage structures have finished being cleared.

• NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorage::Engine::clearAllCaches):
(WebKit::CacheStorage::Engine::clearCachesForOrigin):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngine.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-10  Youenn Fablet  <youenn@apple.com>
+
+        Clear Cache Storage structures before removing all related files
+        https://bugs.webkit.org/show_bug.cgi?id=196650
+
+        Reviewed by Alex Christensen.
+
+        Previously, we were clearing files in parallel to clearing the internal CacheStorage structures.
+        To make things more deterministic, clear files/folders directly
+        after CachesStorage structures have finished being cleared.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::clearAllCaches):
+        (WebKit::CacheStorage::Engine::clearCachesForOrigin):
+
 2019-04-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp

@@ -524 +524 @@
     ASSERT(RunLoop::isMain());
 
-    auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
+    auto callbackAggregator = CallbackAggregator::create([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
+        if (!this->shouldPersist())
+            return;
+        
+        this->clearAllCachesFromDisk(WTFMove(completionHandler));
+    });
 
     for (auto& caches : m_caches.values())
         caches->clear([callbackAggregator = callbackAggregator.copyRef()] { });
-
-    if (!shouldPersist())
-        return;
-
-    clearAllCachesFromDisk([callbackAggregator = WTFMove(callbackAggregator)] { });
 }
 
@@ -552 +552 @@
     ASSERT(RunLoop::isMain());
 
-    auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
+    auto callbackAggregator = CallbackAggregator::create([this, protectedThis = makeRef(*this), origin, completionHandler = WTFMove(completionHandler)]() mutable {
+        if (!this->shouldPersist())
+            return;
+
+        this->clearCachesForOriginFromDisk(origin, [completionHandler = WTFMove(completionHandler)]() mutable {
+            completionHandler();
+        });
+    });
 
     for (auto& keyValue : m_caches) {
@@ -558 +565 @@
             keyValue.value->clear([callbackAggregator = callbackAggregator.copyRef()] { });
     }
-
-    if (!shouldPersist())
-        return;
-
-    clearCachesForOriginFromDisk(origin, [callbackAggregator = WTFMove(callbackAggregator)] { });
 }