<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183755] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183755">183755</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-05-04 11:51:36 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Cache: Support time based cache clearing
https://bugs.webkit.org/show_bug.cgi?id=144568
<rdar://problem/19769820>
Reviewed by Andreas Kling.
Support clearing cache entries newer than given time only.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::deleteDumpFile):
(WebKit::NetworkCache::Storage::traverse):
Also fix thread safety of traverse handler function.
(WebKit::NetworkCache::Cache::clear):
Also add completion handler to support the API properly.
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::clear):
* NetworkProcess/cache/NetworkCacheStorage.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::clearNSURLCache):
Factor to a function.
(WebKit::NetworkProcess::clearDiskCache):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-05-04 Antti Koivisto <antti@apple.com>
+
+ Network Cache: Support time based cache clearing
+ https://bugs.webkit.org/show_bug.cgi?id=144568
+ <rdar://problem/19769820>
+
+ Reviewed by Andreas Kling.
+
+ Support clearing cache entries newer than given time only.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::deleteDumpFile):
+ (WebKit::NetworkCache::Storage::traverse):
+
+ Also fix thread safety of traverse handler function.
+
+ (WebKit::NetworkCache::Cache::clear):
+
+ Also add completion handler to support the API properly.
+
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::clear):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::clearNSURLCache):
+
+ Factor to a function.
+
+ (WebKit::NetworkProcess::clearDiskCache):
+
</ins><span class="cx"> 2015-05-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WTF] Remove Functional.h inclusions
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -524,22 +525,35 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Cache::clear()
</del><ins>+void Cache::deleteDumpFile()
</ins><span class="cx"> {
</span><ins>+ auto queue = WorkQueue::create("com.apple.WebKit.Cache.delete");
+ StringCapture dumpFilePathCapture(dumpFilePath());
+ queue->dispatch([dumpFilePathCapture] {
+ WebCore::deleteFile(dumpFilePathCapture.string());
+ });
+}
+
+void Cache::clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler)
+{
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) clearing cache");
</span><del>- if (m_storage) {
- m_storage->clear();
</del><ins>+ deleteDumpFile();
</ins><span class="cx">
</span><del>- auto queue = WorkQueue::create("com.apple.WebKit.Cache.delete");
- StringCapture dumpFilePathCapture(dumpFilePath());
- queue->dispatch([dumpFilePathCapture] {
- WebCore::deleteFile(dumpFilePathCapture.string());
- });
- }
</del><span class="cx"> if (m_statistics)
</span><span class="cx"> m_statistics->clear();
</span><ins>+
+ if (!m_storage) {
+ RunLoop::main().dispatch(completionHandler);
+ return;
+ }
+ m_storage->clear(modifiedSince, WTF::move(completionHandler));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cache::clear()
+{
+ clear(std::chrono::system_clock::time_point::min(), nullptr);
+}
+
</ins><span class="cx"> String Cache::recordsPath() const
</span><span class="cx"> {
</span><span class="cx"> return m_storage ? m_storage->recordsPath() : String();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> void remove(const Key&);
</span><span class="cx">
</span><span class="cx"> void clear();
</span><ins>+ void clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> void dumpContentsToFile();
</span><span class="cx">
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> ~Cache() = delete;
</span><span class="cx">
</span><span class="cx"> String dumpFilePath() const;
</span><ins>+ void deleteDumpFile();
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<Storage> m_storage;
</span><span class="cx"> std::unique_ptr<Statistics> m_statistics;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -657,9 +657,15 @@
</span><span class="cx"> dispatchPendingWriteOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::traverse(TraverseFlags flags, std::function<void (const Record*, const RecordInfo&)>&& traverseHandler)
</del><ins>+void Storage::traverse(TraverseFlags flags, TraverseHandler&& traverseHandler)
</ins><span class="cx"> {
</span><del>- ioQueue().dispatch([this, flags, traverseHandler] {
</del><ins>+ ASSERT(RunLoop::isMain());
+ ASSERT(traverseHandler);
+ // Avoid non-thread safe std::function copies.
+ auto* traverseHandlerPtr = new TraverseHandler(WTF::move(traverseHandler));
+
+ ioQueue().dispatch([this, flags, traverseHandlerPtr] {
+ auto& traverseHandler = *traverseHandlerPtr;
</ins><span class="cx"> traverseCacheFiles(recordsPath(), [this, flags, &traverseHandler](const String& fileName, const String& partitionPath) {
</span><span class="cx"> if (fileName.length() != Key::hashStringLength())
</span><span class="cx"> return;
</span><span class="lines">@@ -684,8 +690,9 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> });
</span><del>- RunLoop::main().dispatch([this, traverseHandler] {
- traverseHandler(nullptr, { });
</del><ins>+ RunLoop::main().dispatch([this, traverseHandlerPtr] {
+ (*traverseHandlerPtr)(nullptr, { });
+ delete traverseHandlerPtr;
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -708,7 +715,7 @@
</span><span class="cx"> shrinkIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::clear()
</del><ins>+void Storage::clear(std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) clearing cache");
</span><span class="lines">@@ -719,18 +726,34 @@
</span><span class="cx"> m_bodyFilter->clear();
</span><span class="cx"> m_approximateRecordsSize = 0;
</span><span class="cx">
</span><del>- ioQueue().dispatch([this] {
</del><ins>+ // Avoid non-thread safe std::function copies.
+ auto* completionHandlerPtr = completionHandler ? new std::function<void ()>(WTF::move(completionHandler)) : nullptr;
+
+ ioQueue().dispatch([this, modifiedSinceTime, completionHandlerPtr] {
</ins><span class="cx"> auto recordsPath = this->recordsPath();
</span><del>- traverseDirectory(recordsPath, DT_DIR, [&recordsPath](const String& subdirName) {
</del><ins>+ traverseDirectory(recordsPath, DT_DIR, [&recordsPath, modifiedSinceTime](const String& subdirName) {
</ins><span class="cx"> String subdirPath = WebCore::pathByAppendingComponent(recordsPath, subdirName);
</span><del>- traverseDirectory(subdirPath, DT_REG, [&subdirPath](const String& fileName) {
- WebCore::deleteFile(WebCore::pathByAppendingComponent(subdirPath, fileName));
</del><ins>+ traverseDirectory(subdirPath, DT_REG, [&subdirPath, modifiedSinceTime](const String& fileName) {
+ auto filePath = WebCore::pathByAppendingComponent(subdirPath, fileName);
+ if (modifiedSinceTime > std::chrono::system_clock::time_point::min()) {
+ auto times = fileTimes(filePath);
+ if (times.modification < modifiedSinceTime)
+ return;
+ }
+ WebCore::deleteFile(filePath);
</ins><span class="cx"> });
</span><span class="cx"> WebCore::deleteEmptyDirectory(subdirPath);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // This cleans unreferences blobs.
</span><span class="cx"> m_blobStorage.synchronize();
</span><ins>+
+ if (completionHandlerPtr) {
+ RunLoop::main().dispatch([completionHandlerPtr] {
+ (*completionHandlerPtr)();
+ delete completionHandlerPtr;
+ });
+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> void store(const Record&, MappedBodyHandler&&);
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span><ins>+ void clear(std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> struct RecordInfo {
</span><span class="cx"> size_t bodySize { 0 };
</span><span class="lines">@@ -74,12 +75,12 @@
</span><span class="cx"> ShareCount = 1 << 1,
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned TraverseFlags;
</span><ins>+ typedef std::function<void (const Record*, const RecordInfo&)> TraverseHandler;
</ins><span class="cx"> // Null record signals end.
</span><del>- void traverse(TraverseFlags, std::function<void (const Record*, const RecordInfo&)>&&);
</del><ins>+ void traverse(TraverseFlags, TraverseHandler&&);
</ins><span class="cx">
</span><span class="cx"> void setCapacity(size_t);
</span><span class="cx"> size_t approximateSize() const;
</span><del>- void clear();
</del><span class="cx">
</span><span class="cx"> static const unsigned version = 3;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (183754 => 183755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-05-04 18:47:33 UTC (rev 183754)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-05-04 18:51:36 UTC (rev 183755)
</span><span class="lines">@@ -155,16 +155,9 @@
</span><span class="cx"> [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</del><ins>+static void clearNSURLCache(dispatch_group_t group, std::chrono::system_clock::time_point modifiedSince, const std::function<void ()>& completionHandler)
</ins><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_CACHE)
- NetworkCache::singleton().clear();
-#endif
-
- if (!m_clearCacheDispatchGroup)
- m_clearCacheDispatchGroup = dispatch_group_create();
-
- dispatch_group_async(m_clearCacheDispatchGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
</del><ins>+ dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
</ins><span class="cx"> NSURLCache *cache = [NSURLCache sharedURLCache];
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="lines">@@ -180,6 +173,24 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+ if (!m_clearCacheDispatchGroup)
+ m_clearCacheDispatchGroup = dispatch_group_create();
+
+#if ENABLE(NETWORK_CACHE)
+ auto group = m_clearCacheDispatchGroup;
+ dispatch_group_async(group, dispatch_get_main_queue(), [group, modifiedSince, completionHandler] {
+ NetworkCache::singleton().clear(modifiedSince, [group, modifiedSince, completionHandler] {
+ // FIXME: Probably not necessary.
+ clearNSURLCache(group, modifiedSince, completionHandler);
+ });
+ });
+#else
+ clearNSURLCache(m_clearCacheDispatchGroup, modifiedSince, completionHandler);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>