<!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>[180894] trunk/Source</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/180894">180894</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-02 13:51:13 -0800 (Mon, 02 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add way to dump cache meta data to file
https://bugs.webkit.org/show_bug.cgi?id=142183
Reviewed by Andreas Kling.
Source/JavaScriptCore:
Export appendQuotedJSONStringToBuilder.
* bytecompiler/NodesCodegen.cpp:
(JSC::ObjectPatternNode::toString):
* runtime/JSONObject.cpp:
(JSC::appendQuotedJSONStringToBuilder):
(JSC::Stringifier::appendQuotedString):
(JSC::escapeStringToBuilder): Deleted.
* runtime/JSONObject.h:
Source/WebKit2:
Dump goes to WebKitCache/dump.json. On OSX it can be triggered with
notifyutil -p com.apple.WebKit.Cache.dump
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::initialize):
(WebKit::NetworkCache::dumpFilePath):
(WebKit::entryAsJSON):
(WebKit::NetworkCache::dumpContentsToFile):
(WebKit::NetworkCache::clear):
Also clear any dumps.
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStorage.h:
(WebKit::NetworkCacheStorage::baseDirectoryPath):
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::fileNameForKey):
(WebKit::filePathForKey):
(WebKit::openFile):
(WebKit::openFileForKey):
(WebKit::decodeEntryHeader):
Separate header decoding.
(WebKit::decodeEntry):
(WebKit::NetworkCacheStorage::traverse):
Add asynchronous cache traversal inteface.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjectcpp">trunk/Source/JavaScriptCore/runtime/JSONObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjecth">trunk/Source/JavaScriptCore/runtime/JSONObject.h</a></li>
<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="#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="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-02 Antti Koivisto <antti@apple.com>
+
+ Add way to dump cache meta data to file
+ https://bugs.webkit.org/show_bug.cgi?id=142183
+
+ Reviewed by Andreas Kling.
+
+ Export appendQuotedJSONStringToBuilder.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ObjectPatternNode::toString):
+ * runtime/JSONObject.cpp:
+ (JSC::appendQuotedJSONStringToBuilder):
+ (JSC::Stringifier::appendQuotedString):
+ (JSC::escapeStringToBuilder): Deleted.
+ * runtime/JSONObject.h:
+
</ins><span class="cx"> 2015-03-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add Context Menus to Object Tree properties
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -2927,11 +2927,9 @@
</span><span class="cx"> {
</span><span class="cx"> builder.append('{');
</span><span class="cx"> for (size_t i = 0; i < m_targetPatterns.size(); i++) {
</span><del>- if (m_targetPatterns[i].wasString) {
- builder.append('"');
- escapeStringToBuilder(builder, m_targetPatterns[i].propertyName.string());
- builder.append('"');
- } else
</del><ins>+ if (m_targetPatterns[i].wasString)
+ appendQuotedJSONStringToBuilder(builder, m_targetPatterns[i].propertyName.string());
+ else
</ins><span class="cx"> builder.append(m_targetPatterns[i].propertyName.string());
</span><span class="cx"> builder.append(':');
</span><span class="cx"> m_targetPatterns[i].pattern->toString(builder);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -304,26 +304,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void escapeStringToBuilder(StringBuilder& builder, const String& message)
</del><ins>+void appendQuotedJSONStringToBuilder(StringBuilder& builder, const String& message)
</ins><span class="cx"> {
</span><ins>+ builder.append('"');
+
</ins><span class="cx"> if (message.is8Bit())
</span><span class="cx"> appendStringToStringBuilder(builder, message.characters8(), message.length());
</span><span class="cx"> else
</span><span class="cx"> appendStringToStringBuilder(builder, message.characters16(), message.length());
</span><ins>+
+ builder.append('"');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Stringifier::appendQuotedString(StringBuilder& builder, const String& value)
</span><span class="cx"> {
</span><del>- int length = value.length();
-
- builder.append('"');
-
- if (value.is8Bit())
- appendStringToStringBuilder<LChar>(builder, value.characters8(), length);
- else
- appendStringToStringBuilder<UChar>(builder, value.characters16(), length);
-
- builder.append('"');
</del><ins>+ appendQuotedJSONStringToBuilder(builder, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline JSValue Stringifier::toJSON(JSValue value, const PropertyNameForFunctionCall& propertyName)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.h (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.h 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.h 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx"> JS_EXPORT_PRIVATE JSValue JSONParse(ExecState*, const String&);
</span><span class="cx"> JS_EXPORT_PRIVATE String JSONStringify(ExecState*, JSValue, unsigned indent);
</span><span class="cx">
</span><del>-void escapeStringToBuilder(StringBuilder&, const String&);
</del><ins>+JS_EXPORT_PRIVATE void appendQuotedJSONStringToBuilder(StringBuilder&, const String&);
+
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-03-02 Antti Koivisto <antti@apple.com>
+
+ Add way to dump cache meta data to file
+ https://bugs.webkit.org/show_bug.cgi?id=142183
+
+ Reviewed by Andreas Kling.
+
+ Dump goes to WebKitCache/dump.json. On OSX it can be triggered with
+
+ notifyutil -p com.apple.WebKit.Cache.dump
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::initialize):
+ (WebKit::NetworkCache::dumpFilePath):
+ (WebKit::entryAsJSON):
+ (WebKit::NetworkCache::dumpContentsToFile):
+ (WebKit::NetworkCache::clear):
+
+ Also clear any dumps.
+
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ (WebKit::NetworkCacheStorage::baseDirectoryPath):
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::fileNameForKey):
+ (WebKit::filePathForKey):
+ (WebKit::openFile):
+ (WebKit::openFileForKey):
+ (WebKit::decodeEntryHeader):
+
+ Separate header decoding.
+
+ (WebKit::decodeEntry):
+ (WebKit::NetworkCacheStorage::traverse):
+
+ Add asynchronous cache traversal inteface.
+
</ins><span class="cx"> 2015-03-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore should handle deleting cookies
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -34,7 +34,9 @@
</span><span class="cx"> #include "NetworkCacheStorage.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include <JavaScriptCore/JSONObject.h>
</ins><span class="cx"> #include <WebCore/CacheValidation.h>
</span><ins>+#include <WebCore/FileSystem.h>
</ins><span class="cx"> #include <WebCore/HTTPHeaderNames.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -42,6 +44,10 @@
</span><span class="cx"> #include <wtf/StringHasher.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include <notify.h>
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NetworkCache& NetworkCache::singleton()
</span><span class="lines">@@ -57,6 +63,16 @@
</span><span class="cx"> if (enableEfficacyLogging)
</span><span class="cx"> m_statistics = NetworkCacheStatistics::open(cachePath);
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ // Triggers with "notifyutil -p com.apple.WebKit.Cache.dump".
+ if (m_storage) {
+ int token;
+ notify_register_dispatch("com.apple.WebKit.Cache.dump", &token, dispatch_get_main_queue(), ^(int) {
+ dumpContentsToFile();
+ });
+ }
+#endif
+
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) opened cache storage, success %d", !!m_storage);
</span><span class="cx"> return !!m_storage;
</span><span class="cx"> }
</span><span class="lines">@@ -354,11 +370,81 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String NetworkCache::dumpFilePath() const
+{
+ return WebCore::pathByAppendingComponent(m_storage->baseDirectoryPath(), "dump.json");
+}
+
+static bool entryAsJSON(StringBuilder& json, const NetworkCacheKey& key, const NetworkCacheStorage::Entry& entry)
+{
+ NetworkCacheDecoder decoder(entry.header.data(), entry.header.size());
+ WebCore::ResourceResponse cachedResponse;
+ if (!decoder.decode(cachedResponse))
+ return false;
+ json.append("{\n");
+ json.append("\"hash\": ");
+ JSC::appendQuotedJSONStringToBuilder(json, key.hashAsString());
+ json.append(",\n");
+ json.append("\"partition\": ");
+ JSC::appendQuotedJSONStringToBuilder(json, key.partition());
+ json.append(",\n");
+ json.append("\"timestamp\": ");
+ json.appendNumber(entry.timeStamp.count());
+ json.append(",\n");
+ json.append("\"URL\": ");
+ JSC::appendQuotedJSONStringToBuilder(json, cachedResponse.url().string());
+ json.append(",\n");
+ json.append("\"headers\": {\n");
+ bool firstHeader = true;
+ for (auto& header : cachedResponse.httpHeaderFields()) {
+ if (!firstHeader)
+ json.append(",\n");
+ firstHeader = false;
+ json.append(" ");
+ JSC::appendQuotedJSONStringToBuilder(json, header.key);
+ json.append(": ");
+ JSC::appendQuotedJSONStringToBuilder(json, header.value);
+ }
+ json.append("\n}\n");
+ json.append("}");
+ return true;
+}
+
+void NetworkCache::dumpContentsToFile()
+{
+ if (!m_storage)
+ return;
+ auto dumpFileHandle = WebCore::openFile(dumpFilePath(), WebCore::OpenForWrite);
+ if (!dumpFileHandle)
+ return;
+ WebCore::writeToFile(dumpFileHandle, "[\n", 2);
+ m_storage->traverse([dumpFileHandle](const NetworkCacheKey& key, const NetworkCacheStorage::Entry* entry) {
+ if (!entry) {
+ WebCore::writeToFile(dumpFileHandle, "{}\n]\n", 5);
+ auto handle = dumpFileHandle;
+ WebCore::closeFile(handle);
+ }
+ StringBuilder json;
+ if (!entryAsJSON(json, key, *entry))
+ return;
+ json.append(",\n");
+ auto writeData = json.toString().utf8();
+ WebCore::writeToFile(dumpFileHandle, writeData.data(), writeData.length());
+ });
+}
+
</ins><span class="cx"> void NetworkCache::clear()
</span><span class="cx"> {
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) clearing cache");
</span><del>- if (m_storage)
</del><ins>+ if (m_storage) {
</ins><span class="cx"> m_storage->clear();
</span><ins>+
+ auto queue = WorkQueue::create("com.apple.WebKit.Cache.delete");
+ StringCapture dumpFilePathCapture(dumpFilePath());
+ queue->dispatch([dumpFilePathCapture] {
+ WebCore::deleteFile(dumpFilePathCapture.string());
+ });
+ }
</ins><span class="cx"> if (m_statistics)
</span><span class="cx"> m_statistics->clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -101,12 +101,16 @@
</span><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><ins>+ void dumpContentsToFile();
+
</ins><span class="cx"> String storagePath() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkCache() = default;
</span><span class="cx"> ~NetworkCache() = delete;
</span><span class="cx">
</span><ins>+ String dumpFilePath() const;
+
</ins><span class="cx"> std::unique_ptr<NetworkCacheStorage> m_storage;
</span><span class="cx"> std::unique_ptr<NetworkCacheStatistics> m_statistics;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -148,11 +148,15 @@
</span><span class="cx"> void store(const NetworkCacheKey&, const Entry&, StoreCompletionHandler&&);
</span><span class="cx"> void update(const NetworkCacheKey&, const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&&);
</span><span class="cx">
</span><ins>+ // Null entry signals end.
+ void traverse(std::function<void (const NetworkCacheKey&, const Entry*)>&&);
+
</ins><span class="cx"> void setMaximumSize(size_t);
</span><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> static const unsigned version = 2;
</span><span class="cx">
</span><ins>+ const String& baseDirectoryPath() const { return m_baseDirectoryPath; }
</ins><span class="cx"> const String& directoryPath() const { return m_directoryPath; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (180893 => 180894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-02 21:07:33 UTC (rev 180893)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-02 21:51:13 UTC (rev 180894)
</span><span class="lines">@@ -140,13 +140,18 @@
</span><span class="cx"> return WebCore::pathByAppendingComponent(cachePath, key.partition());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String fileNameForKey(const NetworkCacheKey& key)
+{
+ return key.hashAsString();
+}
+
</ins><span class="cx"> static String filePathForKey(const NetworkCacheKey& key, const String& cachePath)
</span><span class="cx"> {
</span><del>- return WebCore::pathByAppendingComponent(directoryPathForKey(key, cachePath), key.hashAsString());
</del><ins>+ return WebCore::pathByAppendingComponent(directoryPathForKey(key, cachePath), fileNameForKey(key));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum class FileOpenType { Read, Write, Create };
</span><del>-static DispatchPtr<dispatch_io_t> openFileForKey(const NetworkCacheKey& key, FileOpenType type, const String& cachePath, int& fd)
</del><ins>+static DispatchPtr<dispatch_io_t> openFile(const String& fileName, const String& directoryPath, FileOpenType type, int& fd)
</ins><span class="cx"> {
</span><span class="cx"> int oflag;
</span><span class="cx"> mode_t mode;
</span><span class="lines">@@ -155,7 +160,7 @@
</span><span class="cx"> case FileOpenType::Create:
</span><span class="cx"> oflag = O_RDWR | O_CREAT | O_TRUNC | O_NONBLOCK;
</span><span class="cx"> mode = S_IRUSR | S_IWUSR;
</span><del>- WebCore::makeAllDirectories(directoryPathForKey(key, cachePath));
</del><ins>+ WebCore::makeAllDirectories(directoryPath);
</ins><span class="cx"> break;
</span><span class="cx"> case FileOpenType::Write:
</span><span class="cx"> oflag = O_WRONLY | O_NONBLOCK;
</span><span class="lines">@@ -166,7 +171,7 @@
</span><span class="cx"> mode = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CString path = WebCore::fileSystemRepresentation(filePathForKey(key, cachePath));
</del><ins>+ CString path = WebCore::fileSystemRepresentation(WebCore::pathByAppendingComponent(directoryPath, fileName));
</ins><span class="cx"> fd = ::open(path.data(), oflag, mode);
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) opening %s type=%d", path.data(), type);
</span><span class="lines">@@ -183,6 +188,11 @@
</span><span class="cx"> return channel;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static DispatchPtr<dispatch_io_t> openFileForKey(const NetworkCacheKey& key, FileOpenType type, const String& cachePath, int& fd)
+{
+ return openFile(fileNameForKey(key), directoryPathForKey(key, cachePath), type, fd);
+}
+
</ins><span class="cx"> static unsigned hashData(dispatch_data_t data)
</span><span class="cx"> {
</span><span class="cx"> if (!data || !dispatch_data_get_size(data))
</span><span class="lines">@@ -250,27 +260,36 @@
</span><span class="cx"> return bodyMap;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool decodeEntryHeader(dispatch_data_t fileData, EntryMetaData& metaData, NetworkCacheStorage::Data& data)
+{
+ if (!decodeEntryMetaData(metaData, fileData))
+ return false;
+ if (metaData.cacheStorageVersion != NetworkCacheStorage::version)
+ return false;
+ if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
+ return false;
+
+ auto headerData = adoptDispatch(dispatch_data_create_subrange(fileData, metaData.headerOffset, metaData.headerSize));
+ if (metaData.headerChecksum != hashData(headerData.get())) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
+ return false;
+ }
+ data = NetworkCacheStorage::Data { headerData };
+ return true;
+}
+
</ins><span class="cx"> static std::unique_ptr<NetworkCacheStorage::Entry> decodeEntry(dispatch_data_t fileData, int fd, const NetworkCacheKey& key)
</span><span class="cx"> {
</span><span class="cx"> EntryMetaData metaData;
</span><del>- if (!decodeEntryMetaData(metaData, fileData))
</del><ins>+ NetworkCacheStorage::Data headerData;
+ if (!decodeEntryHeader(fileData, metaData, headerData))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (metaData.cacheStorageVersion != NetworkCacheStorage::version)
- return nullptr;
</del><span class="cx"> if (metaData.key != key)
</span><span class="cx"> return nullptr;
</span><del>- if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
- return nullptr;
</del><span class="cx"> if (metaData.bodyOffset + metaData.bodySize != dispatch_data_get_size(fileData))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto headerData = adoptDispatch(dispatch_data_create_subrange(fileData, metaData.headerOffset, metaData.headerSize));
- if (metaData.headerChecksum != hashData(headerData.get())) {
- LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
- return nullptr;
- }
-
</del><span class="cx"> auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
</span><span class="cx"> if (!bodyData) {
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
</span><span class="lines">@@ -284,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> return std::make_unique<NetworkCacheStorage::Entry>(NetworkCacheStorage::Entry {
</span><span class="cx"> metaData.timeStamp,
</span><del>- NetworkCacheStorage::Data { headerData },
</del><ins>+ headerData,
</ins><span class="cx"> NetworkCacheStorage::Data { bodyData, NetworkCacheStorage::Data::Backing::Map }
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -471,6 +490,34 @@
</span><span class="cx"> dispatchPendingWriteOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkCacheStorage::traverse(std::function<void (const NetworkCacheKey&, const Entry*)>&& traverseHandler)
+{
+ StringCapture cachePathCapture(m_directoryPath);
+ dispatch_async(m_ioQueue.get(), [this, cachePathCapture, traverseHandler] {
+ String cachePath = cachePathCapture.string();
+ auto semaphore = adoptDispatch(dispatch_semaphore_create(0));
+ traverseCacheFiles(cachePath, [this, &semaphore, &traverseHandler](const String& fileName, const String& partitionPath) {
+ int fd;
+ auto channel = openFile(fileName, partitionPath, FileOpenType::Read, fd);
+ const size_t headerReadSize = 16 << 10;
+ dispatch_io_read(channel.get(), 0, headerReadSize, dispatch_get_main_queue(), [this, fd, &semaphore, &traverseHandler](bool done, dispatch_data_t fileData, int) {
+ EntryMetaData metaData;
+ NetworkCacheStorage::Data headerData;
+ if (decodeEntryHeader(fileData, metaData, headerData)) {
+ Entry entry { metaData.timeStamp, headerData, Data() };
+ traverseHandler(metaData.key, &entry);
+ }
+ if (done)
+ dispatch_semaphore_signal(semaphore.get());
+ });
+ dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
+ });
+ dispatch_async(dispatch_get_main_queue(), [this, traverseHandler] {
+ traverseHandler({ }, nullptr);
+ });
+ });
+}
+
</ins><span class="cx"> void NetworkCacheStorage::dispatchPendingWriteOperations()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span></span></pre>
</div>
</div>
</body>
</html>