<!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>[181364] 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/181364">181364</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-10 21:08:53 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add interface to delete disk cache entries
https://bugs.webkit.org/show_bug.cgi?id=142546
Reviewed by Anders Carlsson.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::remove):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::Storage):
(WebKit::NetworkCache::Storage::remove):
Move deletion to a serial queue so we can't create large number of threads.
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::Storage::dispatchHeaderWriteOperation):
(WebKit::NetworkCache::Storage::removeEntry): Deleted.
* NetworkProcess/cache/NetworkCacheStorage.h:
(WebKit::NetworkCache::Storage::deleteQueue):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181363 => 181364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-11 03:29:44 UTC (rev 181363)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-11 04:08:53 UTC (rev 181364)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-10 Antti Koivisto <antti@apple.com>
+
+ Add interface to delete disk cache entries
+ https://bugs.webkit.org/show_bug.cgi?id=142546
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::remove):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::Storage):
+ (WebKit::NetworkCache::Storage::remove):
+
+ Move deletion to a serial queue so we can't create large number of threads.
+
+ (WebKit::NetworkCache::Storage::dispatchReadOperation):
+ (WebKit::NetworkCache::Storage::dispatchHeaderWriteOperation):
+ (WebKit::NetworkCache::Storage::removeEntry): Deleted.
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ (WebKit::NetworkCache::Storage::deleteQueue):
+
</ins><span class="cx"> 2015-03-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> 5 tests fail on Apple Mac WK2 performance bots
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (181363 => 181364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-11 03:29:44 UTC (rev 181363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-11 04:08:53 UTC (rev 181364)
</span><span class="lines">@@ -373,6 +373,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cache::remove(const Entry& entry)
+{
+ ASSERT(isEnabled());
+
+ m_storage->remove(entry.storageEntry.key);
+}
+
</ins><span class="cx"> void Cache::traverse(std::function<void (const Entry*)>&& traverseHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (181363 => 181364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-11 03:29:44 UTC (rev 181363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-11 04:08:53 UTC (rev 181364)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> void update(const WebCore::ResourceRequest&, const Entry&, const WebCore::ResourceResponse& validatingResponse);
</span><span class="cx">
</span><span class="cx"> void traverse(std::function<void (const Entry*)>&&);
</span><ins>+ void remove(const Entry&);
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (181363 => 181364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-11 03:29:44 UTC (rev 181363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-11 04:08:53 UTC (rev 181364)
</span><span class="lines">@@ -64,7 +64,8 @@
</span><span class="cx"> : m_baseDirectoryPath(baseDirectoryPath)
</span><span class="cx"> , m_directoryPath(makeVersionedDirectoryPath(baseDirectoryPath))
</span><span class="cx"> , m_ioQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent))
</span><del>- , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
</del><ins>+ , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.background", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
+ , m_deleteQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.delete", WorkQueue::Type::Serial, WorkQueue::QOS::Background))
</ins><span class="cx"> {
</span><span class="cx"> deleteOldVersions();
</span><span class="cx"> initialize();
</span><span class="lines">@@ -263,18 +264,18 @@
</span><span class="cx"> return concatenate(headerData, alignmentData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::removeEntry(const Key& key)
</del><ins>+void Storage::remove(const Key& key)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- // For simplicity we don't reduce m_approximateSize on removals caused by load or decode errors.
</del><ins>+ // For simplicity we don't reduce m_approximateSize on removals.
</ins><span class="cx"> // The next cache shrink will update the size.
</span><span class="cx">
</span><span class="cx"> if (m_contentsFilter.mayContain(key.shortHash()))
</span><span class="cx"> m_contentsFilter.remove(key.shortHash());
</span><span class="cx">
</span><span class="cx"> StringCapture filePathCapture(filePathForKey(key, m_directoryPath));
</span><del>- backgroundIOQueue().dispatch([this, filePathCapture] {
</del><ins>+ deleteQueue().dispatch([this, filePathCapture] {
</ins><span class="cx"> WebCore::deleteFile(filePathCapture.string());
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -290,13 +291,13 @@
</span><span class="cx"> int fd = channel->fileDescriptor();
</span><span class="cx"> channel->read(0, std::numeric_limits<size_t>::max(), [this, &read, fd](Data& fileData, int error) {
</span><span class="cx"> if (error) {
</span><del>- removeEntry(read.key);
</del><ins>+ remove(read.key);
</ins><span class="cx"> read.completionHandler(nullptr);
</span><span class="cx"> } else {
</span><span class="cx"> auto entry = decodeEntry(fileData, fd, read.key);
</span><span class="cx"> bool success = read.completionHandler(WTF::move(entry));
</span><span class="cx"> if (!success)
</span><del>- removeEntry(read.key);
</del><ins>+ remove(read.key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(m_activeReadOperations.contains(&read));
</span><span class="lines">@@ -520,7 +521,7 @@
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) update complete error=%d", error);
</span><span class="cx">
</span><span class="cx"> if (error)
</span><del>- removeEntry(write.entry.key);
</del><ins>+ remove(write.entry.key);
</ins><span class="cx">
</span><span class="cx"> write.completionHandler(!error, { });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (181363 => 181364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-11 03:29:44 UTC (rev 181363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-11 04:08:53 UTC (rev 181364)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> void store(const Entry&, StoreCompletionHandler&&);
</span><span class="cx"> void update(const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&&);
</span><span class="cx">
</span><ins>+ void remove(const Key&);
+
</ins><span class="cx"> // Null entry signals end.
</span><span class="cx"> void traverse(std::function<void (const Entry*)>&&);
</span><span class="cx">
</span><span class="lines">@@ -77,8 +79,6 @@
</span><span class="cx"> void deleteOldVersions();
</span><span class="cx"> void shrinkIfNeeded();
</span><span class="cx">
</span><del>- void removeEntry(const Key&);
-
</del><span class="cx"> struct ReadOperation {
</span><span class="cx"> Key key;
</span><span class="cx"> RetrieveCompletionHandler completionHandler;
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx">
</span><span class="cx"> WorkQueue& ioQueue() { return m_ioQueue.get(); }
</span><span class="cx"> WorkQueue& backgroundIOQueue() { return m_backgroundIOQueue.get(); }
</span><ins>+ WorkQueue& deleteQueue() { return m_deleteQueue.get(); }
</ins><span class="cx">
</span><span class="cx"> const String m_baseDirectoryPath;
</span><span class="cx"> const String m_directoryPath;
</span><span class="lines">@@ -116,6 +117,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<WorkQueue> m_ioQueue;
</span><span class="cx"> Ref<WorkQueue> m_backgroundIOQueue;
</span><ins>+ Ref<WorkQueue> m_deleteQueue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>