<!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>[180949] 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/180949">180949</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 12:13:01 -0800 (Tue, 03 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Include key to NetworkCacheStorage::Entry
https://bugs.webkit.org/show_bug.cgi?id=142215
Reviewed by Chris Dumez.
This simplified code. The key is saved as part of the entry so it makes logical sense too.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::makeCacheKey):
(WebKit::encodeStorageEntry):
(WebKit::NetworkCache::retrieve):
(WebKit::NetworkCache::store):
(WebKit::NetworkCache::update):
(WebKit::NetworkCache::traverse):
(WebKit::entryAsJSON):
(WebKit::NetworkCache::dumpContentsToFile):
* NetworkProcess/cache/NetworkCacheKey.cpp:
(WebKit::NetworkCacheKey::operator=):
* NetworkProcess/cache/NetworkCacheKey.h:
(WebKit::NetworkCacheKey::isNull):
* NetworkProcess/cache/NetworkCacheStorage.h:
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::decodeEntry):
(WebKit::encodeEntryHeader):
(WebKit::retrieveFromMemory):
(WebKit::NetworkCacheStorage::retrieve):
(WebKit::NetworkCacheStorage::store):
(WebKit::NetworkCacheStorage::update):
(WebKit::NetworkCacheStorage::traverse):
(WebKit::NetworkCacheStorage::dispatchPendingWriteOperations):
(WebKit::NetworkCacheStorage::dispatchFullWriteOperation):
(WebKit::NetworkCacheStorage::dispatchHeaderWriteOperation):</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2015-03-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Include key to NetworkCacheStorage::Entry
+ https://bugs.webkit.org/show_bug.cgi?id=142215
+
+ Reviewed by Chris Dumez.
+
+ This simplified code. The key is saved as part of the entry so it makes logical sense too.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::makeCacheKey):
+ (WebKit::encodeStorageEntry):
+ (WebKit::NetworkCache::retrieve):
+ (WebKit::NetworkCache::store):
+ (WebKit::NetworkCache::update):
+ (WebKit::NetworkCache::traverse):
+ (WebKit::entryAsJSON):
+ (WebKit::NetworkCache::dumpContentsToFile):
+ * NetworkProcess/cache/NetworkCacheKey.cpp:
+ (WebKit::NetworkCacheKey::operator=):
+ * NetworkProcess/cache/NetworkCacheKey.h:
+ (WebKit::NetworkCacheKey::isNull):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::decodeEntry):
+ (WebKit::encodeEntryHeader):
+ (WebKit::retrieveFromMemory):
+ (WebKit::NetworkCacheStorage::retrieve):
+ (WebKit::NetworkCacheStorage::store):
+ (WebKit::NetworkCacheStorage::update):
+ (WebKit::NetworkCacheStorage::traverse):
+ (WebKit::NetworkCacheStorage::dispatchPendingWriteOperations):
+ (WebKit::NetworkCacheStorage::dispatchFullWriteOperation):
+ (WebKit::NetworkCacheStorage::dispatchHeaderWriteOperation):
+
+2015-03-03 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Cache shrink leaves behind empty partition directories
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142217
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -84,6 +84,18 @@
</span><span class="cx"> m_storage->setMaximumSize(maximumSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NetworkCacheKey makeCacheKey(const WebCore::ResourceRequest& request)
+{
+#if ENABLE(CACHE_PARTITIONING)
+ String partition = request.cachePartition();
+#else
+ String partition;
+#endif
+ if (partition.isEmpty())
+ partition = ASCIILiteral("No partition");
+ return NetworkCacheKey(request.httpMethod(), partition, request.url().string());
+}
+
</ins><span class="cx"> static NetworkCacheStorage::Entry encodeStorageEntry(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, PassRefPtr<WebCore::SharedBuffer> responseData)
</span><span class="cx"> {
</span><span class="cx"> NetworkCacheEncoder encoder;
</span><span class="lines">@@ -113,7 +125,7 @@
</span><span class="cx"> if (responseData)
</span><span class="cx"> body = NetworkCacheStorage::Data(reinterpret_cast<const uint8_t*>(responseData->data()), responseData->size());
</span><span class="cx">
</span><del>- return NetworkCacheStorage::Entry { timeStamp, header, body };
</del><ins>+ return NetworkCacheStorage::Entry { makeCacheKey(request), timeStamp, header, body };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool verifyVaryingRequestHeaders(const Vector<std::pair<String, String>>& varyingRequestHeaders, const WebCore::ResourceRequest& request)
</span><span class="lines">@@ -231,18 +243,6 @@
</span><span class="cx"> return NetworkCache::RetrieveDecision::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NetworkCacheKey makeCacheKey(const WebCore::ResourceRequest& request)
-{
-#if ENABLE(CACHE_PARTITIONING)
- String partition = request.cachePartition();
-#else
- String partition;
-#endif
- if (partition.isEmpty())
- partition = ASCIILiteral("No partition");
- return NetworkCacheKey(request.httpMethod(), partition, request.url().string());
-}
-
</del><span class="cx"> void NetworkCache::retrieve(const WebCore::ResourceRequest& originalRequest, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="lines">@@ -272,6 +272,8 @@
</span><span class="cx"> completionHandler(nullptr);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ ASSERT(entry->key == storageKey);
+
</ins><span class="cx"> CachedEntryReuseFailure failure = CachedEntryReuseFailure::None;
</span><span class="cx"> auto decodedEntry = decodeStorageEntry(*entry, originalRequest, failure);
</span><span class="cx"> bool success = !!decodedEntry;
</span><span class="lines">@@ -329,18 +331,19 @@
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) storing %s, partition %s", originalRequest.url().string().latin1().data(), originalRequest.cachePartition().latin1().data());
</span><span class="cx">
</span><del>- auto key = makeCacheKey(originalRequest);
</del><span class="cx"> StoreDecision storeDecision = canStore(originalRequest, response);
</span><span class="cx"> if (storeDecision != StoreDecision::Yes) {
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) didn't store");
</span><del>- if (m_statistics)
</del><ins>+ if (m_statistics) {
+ auto key = makeCacheKey(originalRequest);
</ins><span class="cx"> m_statistics->recordNotCachingResponse(key, storeDecision);
</span><ins>+ }
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto storageEntry = encodeStorageEntry(originalRequest, response, WTF::move(responseData));
</span><span class="cx">
</span><del>- m_storage->store(key, storageEntry, [completionHandler](bool success, const NetworkCacheStorage::Data& bodyData) {
</del><ins>+ m_storage->store(storageEntry, [completionHandler](bool success, const NetworkCacheStorage::Data& bodyData) {
</ins><span class="cx"> MappedBody mappedBody;
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> if (bodyData.isMap()) {
</span><span class="lines">@@ -362,10 +365,9 @@
</span><span class="cx"> WebCore::ResourceResponse response = entry.response;
</span><span class="cx"> WebCore::updateResponseHeadersAfterRevalidation(response, validatingResponse);
</span><span class="cx">
</span><del>- auto key = makeCacheKey(originalRequest);
</del><span class="cx"> auto updateEntry = encodeStorageEntry(originalRequest, response, entry.buffer);
</span><span class="cx">
</span><del>- m_storage->update(key, updateEntry, entry.storageEntry, [](bool success, const NetworkCacheStorage::Data&) {
</del><ins>+ m_storage->update(updateEntry, entry.storageEntry, [](bool success, const NetworkCacheStorage::Data&) {
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) updated, success=%d", success);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -374,7 +376,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx">
</span><del>- m_storage->traverse([traverseHandler](const NetworkCacheKey& key, const NetworkCacheStorage::Entry* entry) {
</del><ins>+ m_storage->traverse([traverseHandler](const NetworkCacheStorage::Entry* entry) {
</ins><span class="cx"> if (!entry) {
</span><span class="cx"> traverseHandler(nullptr);
</span><span class="cx"> return;
</span><span class="lines">@@ -396,7 +398,7 @@
</span><span class="cx"> return WebCore::pathByAppendingComponent(m_storage->baseDirectoryPath(), "dump.json");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool entryAsJSON(StringBuilder& json, const NetworkCacheKey& key, const NetworkCacheStorage::Entry& entry)
</del><ins>+static bool entryAsJSON(StringBuilder& json, const NetworkCacheStorage::Entry& entry)
</ins><span class="cx"> {
</span><span class="cx"> NetworkCacheDecoder decoder(entry.header.data(), entry.header.size());
</span><span class="cx"> WebCore::ResourceResponse cachedResponse;
</span><span class="lines">@@ -404,10 +406,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> json.append("{\n");
</span><span class="cx"> json.append("\"hash\": ");
</span><del>- JSC::appendQuotedJSONStringToBuilder(json, key.hashAsString());
</del><ins>+ JSC::appendQuotedJSONStringToBuilder(json, entry.key.hashAsString());
</ins><span class="cx"> json.append(",\n");
</span><span class="cx"> json.append("\"partition\": ");
</span><del>- JSC::appendQuotedJSONStringToBuilder(json, key.partition());
</del><ins>+ JSC::appendQuotedJSONStringToBuilder(json, entry.key.partition());
</ins><span class="cx"> json.append(",\n");
</span><span class="cx"> json.append("\"timestamp\": ");
</span><span class="cx"> json.appendNumber(entry.timeStamp.count());
</span><span class="lines">@@ -439,7 +441,7 @@
</span><span class="cx"> if (!dumpFileHandle)
</span><span class="cx"> return;
</span><span class="cx"> WebCore::writeToFile(dumpFileHandle, "[\n", 2);
</span><del>- m_storage->traverse([dumpFileHandle](const NetworkCacheKey& key, const NetworkCacheStorage::Entry* entry) {
</del><ins>+ m_storage->traverse([dumpFileHandle](const NetworkCacheStorage::Entry* entry) {
</ins><span class="cx"> if (!entry) {
</span><span class="cx"> WebCore::writeToFile(dumpFileHandle, "{}\n]\n", 5);
</span><span class="cx"> auto handle = dumpFileHandle;
</span><span class="lines">@@ -447,7 +449,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> StringBuilder json;
</span><del>- if (!entryAsJSON(json, key, *entry))
</del><ins>+ if (!entryAsJSON(json, *entry))
</ins><span class="cx"> return;
</span><span class="cx"> json.append(",\n");
</span><span class="cx"> auto writeData = json.toString().utf8();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -59,6 +59,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NetworkCacheKey& NetworkCacheKey::operator=(const NetworkCacheKey& other)
+{
+ m_method = other.m_method.isolatedCopy();
+ m_partition = other.m_partition.isolatedCopy();
+ m_identifier = other.m_identifier.isolatedCopy();
+ m_hash = other.m_hash;
+ return *this;
+}
+
</ins><span class="cx"> static void hashString(MD5& md5, const String& string)
</span><span class="cx"> {
</span><span class="cx"> const uint8_t zero = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -45,6 +45,10 @@
</span><span class="cx"> NetworkCacheKey(NetworkCacheKey&&);
</span><span class="cx"> NetworkCacheKey(const String& method, const String& partition, const String& identifier);
</span><span class="cx">
</span><ins>+ NetworkCacheKey& operator=(const NetworkCacheKey&);
+
+ bool isNull() const { return m_identifier.isNull(); }
+
</ins><span class="cx"> const String& method() const { return m_method; }
</span><span class="cx"> const String& partition() const { return m_partition; }
</span><span class="cx"> const String& identifier() const { return m_identifier; }
</span><span class="lines">@@ -66,7 +70,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HashType computeHash() const;
</span><del>- void operator=(const NetworkCacheKey&) = delete;
</del><span class="cx">
</span><span class="cx"> String m_method;
</span><span class="cx"> String m_partition;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -136,6 +136,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Entry {
</span><ins>+ NetworkCacheKey key;
</ins><span class="cx"> std::chrono::milliseconds timeStamp;
</span><span class="cx"> Data header;
</span><span class="cx"> Data body;
</span><span class="lines">@@ -145,11 +146,11 @@
</span><span class="cx"> void retrieve(const NetworkCacheKey&, unsigned priority, RetrieveCompletionHandler&&);
</span><span class="cx">
</span><span class="cx"> typedef std::function<void (bool success, const Data& mappedBody)> StoreCompletionHandler;
</span><del>- void store(const NetworkCacheKey&, const Entry&, StoreCompletionHandler&&);
- void update(const NetworkCacheKey&, const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&&);
</del><ins>+ void store(const Entry&, StoreCompletionHandler&&);
+ void update(const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&&);
</ins><span class="cx">
</span><span class="cx"> // Null entry signals end.
</span><del>- void traverse(std::function<void (const NetworkCacheKey&, const Entry*)>&&);
</del><ins>+ void traverse(std::function<void (const Entry*)>&&);
</ins><span class="cx">
</span><span class="cx"> void setMaximumSize(size_t);
</span><span class="cx"> void clear();
</span><span class="lines">@@ -176,7 +177,6 @@
</span><span class="cx"> void dispatchPendingReadOperations();
</span><span class="cx">
</span><span class="cx"> struct WriteOperation {
</span><del>- NetworkCacheKey key;
</del><span class="cx"> Entry entry;
</span><span class="cx"> Optional<Entry> existingEntry;
</span><span class="cx"> StoreCompletionHandler completionHandler;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (180948 => 180949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-03 20:12:54 UTC (rev 180948)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-03 20:13:01 UTC (rev 180949)
</span><span class="lines">@@ -301,7 +301,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return std::make_unique<NetworkCacheStorage::Entry>(NetworkCacheStorage::Entry {
</del><ins>+ return std::unique_ptr<NetworkCacheStorage::Entry>(new NetworkCacheStorage::Entry {
+ metaData.key,
</ins><span class="cx"> metaData.timeStamp,
</span><span class="cx"> headerData,
</span><span class="cx"> NetworkCacheStorage::Data { bodyData, NetworkCacheStorage::Data::Backing::Map }
</span><span class="lines">@@ -325,9 +326,9 @@
</span><span class="cx"> return adoptDispatch(dispatch_data_create(encoder.buffer(), encoder.bufferSize(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static DispatchPtr<dispatch_data_t> encodeEntryHeader(const NetworkCacheKey& key, const NetworkCacheStorage::Entry& entry)
</del><ins>+static DispatchPtr<dispatch_data_t> encodeEntryHeader(const NetworkCacheStorage::Entry& entry)
</ins><span class="cx"> {
</span><del>- EntryMetaData metaData(key);
</del><ins>+ EntryMetaData metaData(entry.key);
</ins><span class="cx"> metaData.timeStamp = entry.timeStamp;
</span><span class="cx"> metaData.headerChecksum = hashData(entry.header.dispatchData());
</span><span class="cx"> metaData.headerSize = entry.header.size();
</span><span class="lines">@@ -421,7 +422,7 @@
</span><span class="cx"> template <class T> bool retrieveFromMemory(const T& operations, const NetworkCacheKey& key, NetworkCacheStorage::RetrieveCompletionHandler& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> for (auto& operation : operations) {
</span><del>- if (operation->key == key) {
</del><ins>+ if (operation->entry.key == key) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) found write operation in progress");
</span><span class="cx"> auto entry = operation->entry;
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [entry, completionHandler] {
</span><span class="lines">@@ -437,6 +438,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(priority <= maximumRetrievePriority);
</span><ins>+ ASSERT(!key.isNull());
</ins><span class="cx">
</span><span class="cx"> if (!m_maximumSize) {
</span><span class="cx"> completionHandler(nullptr);
</span><span class="lines">@@ -453,44 +455,45 @@
</span><span class="cx"> if (retrieveFromMemory(m_activeWriteOperations, key, completionHandler))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_pendingReadOperationsByPriority[priority].append(std::make_unique<ReadOperation>(ReadOperation { key, WTF::move(completionHandler) }));
</del><ins>+ m_pendingReadOperationsByPriority[priority].append(new ReadOperation { key, WTF::move(completionHandler) });
</ins><span class="cx"> dispatchPendingReadOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkCacheStorage::store(const NetworkCacheKey& key, const Entry& entry, StoreCompletionHandler&& completionHandler)
</del><ins>+void NetworkCacheStorage::store(const Entry& entry, StoreCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><ins>+ ASSERT(!entry.key.isNull());
</ins><span class="cx">
</span><span class="cx"> if (!m_maximumSize) {
</span><span class="cx"> completionHandler(false, Data());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto writeOperation = std::make_unique<WriteOperation>(WriteOperation { key, entry, { }, WTF::move(completionHandler) });
- m_pendingWriteOperations.append(WTF::move(writeOperation));
</del><ins>+ m_pendingWriteOperations.append(new WriteOperation { entry, { }, WTF::move(completionHandler) });
</ins><span class="cx">
</span><span class="cx"> // Add key to the filter already here as we do lookups from the pending operations too.
</span><del>- m_contentsFilter.add(key.shortHash());
</del><ins>+ m_contentsFilter.add(entry.key.shortHash());
</ins><span class="cx">
</span><span class="cx"> dispatchPendingWriteOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkCacheStorage::update(const NetworkCacheKey& key, const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&& completionHandler)
</del><ins>+void NetworkCacheStorage::update(const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><ins>+ ASSERT(!existingEntry.key.isNull());
+ ASSERT(existingEntry.key == updateEntry.key);
</ins><span class="cx">
</span><span class="cx"> if (!m_maximumSize) {
</span><span class="cx"> completionHandler(false, Data());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto writeOperation = std::make_unique<WriteOperation>(WriteOperation { key, updateEntry, existingEntry, WTF::move(completionHandler) });
- m_pendingWriteOperations.append(WTF::move(writeOperation));
</del><ins>+ m_pendingWriteOperations.append(new WriteOperation { updateEntry, existingEntry, WTF::move(completionHandler) });
</ins><span class="cx">
</span><span class="cx"> dispatchPendingWriteOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkCacheStorage::traverse(std::function<void (const NetworkCacheKey&, const Entry*)>&& traverseHandler)
</del><ins>+void NetworkCacheStorage::traverse(std::function<void (const Entry*)>&& traverseHandler)
</ins><span class="cx"> {
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><span class="cx"> dispatch_async(m_ioQueue.get(), [this, cachePathCapture, traverseHandler] {
</span><span class="lines">@@ -504,8 +507,8 @@
</span><span class="cx"> EntryMetaData metaData;
</span><span class="cx"> NetworkCacheStorage::Data headerData;
</span><span class="cx"> if (decodeEntryHeader(fileData, metaData, headerData)) {
</span><del>- Entry entry { metaData.timeStamp, headerData, Data() };
- traverseHandler(metaData.key, &entry);
</del><ins>+ Entry entry { metaData.key, metaData.timeStamp, headerData, Data() };
+ traverseHandler(&entry);
</ins><span class="cx"> }
</span><span class="cx"> if (done)
</span><span class="cx"> dispatch_semaphore_signal(semaphore.get());
</span><span class="lines">@@ -513,7 +516,7 @@
</span><span class="cx"> dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
</span><span class="cx"> });
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [this, traverseHandler] {
</span><del>- traverseHandler({ }, nullptr);
</del><ins>+ traverseHandler(nullptr);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -533,7 +536,7 @@
</span><span class="cx"> auto& write = *writeOperation;
</span><span class="cx"> m_activeWriteOperations.add(WTF::move(writeOperation));
</span><span class="cx">
</span><del>- if (write.existingEntry && m_contentsFilter.mayContain(write.key.shortHash())) {
</del><ins>+ if (write.existingEntry && m_contentsFilter.mayContain(write.entry.key.shortHash())) {
</ins><span class="cx"> dispatchHeaderWriteOperation(write);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -546,24 +549,24 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(m_activeWriteOperations.contains(&write));
</span><span class="cx">
</span><del>- if (!m_contentsFilter.mayContain(write.key.shortHash()))
- m_contentsFilter.add(write.key.shortHash());
</del><ins>+ if (!m_contentsFilter.mayContain(write.entry.key.shortHash()))
+ m_contentsFilter.add(write.entry.key.shortHash());
</ins><span class="cx">
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><span class="cx"> dispatch_async(m_backgroundIOQueue.get(), [this, &write, cachePathCapture] {
</span><del>- auto encodedHeader = encodeEntryHeader(write.key, write.entry);
</del><ins>+ auto encodedHeader = encodeEntryHeader(write.entry);
</ins><span class="cx"> auto writeData = adoptDispatch(dispatch_data_create_concat(encodedHeader.get(), write.entry.body.dispatchData()));
</span><span class="cx">
</span><span class="cx"> size_t bodyOffset = dispatch_data_get_size(encodedHeader.get());
</span><span class="cx">
</span><span class="cx"> int fd;
</span><del>- auto channel = openFileForKey(write.key, FileOpenType::Create, cachePathCapture.string(), fd);
</del><ins>+ auto channel = openFileForKey(write.entry.key, FileOpenType::Create, cachePathCapture.string(), fd);
</ins><span class="cx"> dispatch_io_write(channel.get(), 0, writeData.get(), dispatch_get_main_queue(), [this, &write, fd, bodyOffset](bool done, dispatch_data_t, int error) {
</span><span class="cx"> ASSERT_UNUSED(done, done);
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) write complete error=%d", error);
</span><span class="cx"> if (error) {
</span><del>- if (m_contentsFilter.mayContain(write.key.shortHash()))
- m_contentsFilter.remove(write.key.shortHash());
</del><ins>+ if (m_contentsFilter.mayContain(write.entry.key.shortHash()))
+ m_contentsFilter.remove(write.entry.key.shortHash());
</ins><span class="cx"> }
</span><span class="cx"> size_t bodySize = write.entry.body.size();
</span><span class="cx"> size_t totalSize = bodyOffset + bodySize;
</span><span class="lines">@@ -590,13 +593,13 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(write.existingEntry);
</span><span class="cx"> ASSERT(m_activeWriteOperations.contains(&write));
</span><del>- ASSERT(m_contentsFilter.mayContain(write.key.shortHash()));
</del><ins>+ ASSERT(m_contentsFilter.mayContain(write.entry.key.shortHash()));
</ins><span class="cx">
</span><span class="cx"> // Try to update the header of an existing entry.
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><span class="cx"> dispatch_async(m_backgroundIOQueue.get(), [this, &write, cachePathCapture] {
</span><del>- auto headerData = encodeEntryHeader(write.key, write.entry);
- auto existingHeaderData = encodeEntryHeader(write.key, write.existingEntry.value());
</del><ins>+ auto headerData = encodeEntryHeader(write.entry);
+ auto existingHeaderData = encodeEntryHeader(write.existingEntry.value());
</ins><span class="cx">
</span><span class="cx"> bool pageRoundedHeaderSizeChanged = dispatch_data_get_size(headerData.get()) != dispatch_data_get_size(existingHeaderData.get());
</span><span class="cx"> if (pageRoundedHeaderSizeChanged) {
</span><span class="lines">@@ -608,13 +611,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int fd;
</span><del>- auto channel = openFileForKey(write.key, FileOpenType::Write, cachePathCapture.string(), fd);
</del><ins>+ auto channel = openFileForKey(write.entry.key, FileOpenType::Write, cachePathCapture.string(), fd);
</ins><span class="cx"> dispatch_io_write(channel.get(), 0, headerData.get(), dispatch_get_main_queue(), [this, &write](bool done, dispatch_data_t, int error) {
</span><span class="cx"> ASSERT_UNUSED(done, done);
</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.key);
</del><ins>+ removeEntry(write.entry.key);
</ins><span class="cx">
</span><span class="cx"> write.completionHandler(!error, Data());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>