<!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>[182136] 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/182136">182136</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-30 05:22:24 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Include cache entry worth to json dump
https://bugs.webkit.org/show_bug.cgi?id=143202
Reviewed by Darin Adler.
This is useful for analyzing cache performance.
Also include the body size, total item count and average worth.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::traverse):
(WebKit::NetworkCache::Cache::dumpContentsToFile):
* NetworkProcess/cache/NetworkCacheEntry.cpp:
(WebKit::NetworkCache::Entry::asJSON):
* NetworkProcess/cache/NetworkCacheEntry.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::traverse):
Add flags for specificying what sort of information is needed.
(WebKit::NetworkCache::computeRecordWorth):
Factor to a function.
(WebKit::NetworkCache::deletionProbability):
* NetworkProcess/cache/NetworkCacheStorage.h:</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntryh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.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 (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-03-29 Antti Koivisto <antti@apple.com>
+
+ Include cache entry worth to json dump
+ https://bugs.webkit.org/show_bug.cgi?id=143202
+
+ Reviewed by Darin Adler.
+
+ This is useful for analyzing cache performance.
+ Also include the body size, total item count and average worth.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::traverse):
+ (WebKit::NetworkCache::Cache::dumpContentsToFile):
+ * NetworkProcess/cache/NetworkCacheEntry.cpp:
+ (WebKit::NetworkCache::Entry::asJSON):
+ * NetworkProcess/cache/NetworkCacheEntry.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::traverse):
+
+ Add flags for specificying what sort of information is needed.
+
+ (WebKit::NetworkCache::computeRecordWorth):
+
+ Factor to a function.
+
+ (WebKit::NetworkCache::deletionProbability):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2015-03-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix iOS scrollperf crash after a web process crash
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx">
</span><del>- m_storage->traverse([traverseHandler](const Storage::Record* record) {
</del><ins>+ m_storage->traverse(0, [traverseHandler](const Storage::Record* record, const Storage::RecordInfo&) {
</ins><span class="cx"> if (!record) {
</span><span class="cx"> traverseHandler(nullptr);
</span><span class="cx"> return;
</span><span class="lines">@@ -433,25 +433,50 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_storage)
</span><span class="cx"> return;
</span><del>- auto dumpFileHandle = WebCore::openFile(dumpFilePath(), WebCore::OpenForWrite);
- if (!dumpFileHandle)
</del><ins>+ auto fd = WebCore::openFile(dumpFilePath(), WebCore::OpenForWrite);
+ if (!fd)
</ins><span class="cx"> return;
</span><del>- WebCore::writeToFile(dumpFileHandle, "[\n", 2);
- m_storage->traverse([dumpFileHandle](const Storage::Record* record) {
</del><ins>+ auto prologue = String("{\n\"entries\": [\n").utf8();
+ WebCore::writeToFile(fd, prologue.data(), prologue.length());
+
+ struct Totals {
+ unsigned count { 0 };
+ double worth { 0 };
+ size_t bodySize { 0 };
+ };
+ Totals totals;
+ m_storage->traverse(Storage::TraverseFlag::ComputeWorth, [fd, totals](const Storage::Record* record, const Storage::RecordInfo& info) mutable {
</ins><span class="cx"> if (!record) {
</span><del>- WebCore::writeToFile(dumpFileHandle, "{}\n]\n", 5);
- auto handle = dumpFileHandle;
- WebCore::closeFile(handle);
</del><ins>+ StringBuilder epilogue;
+ epilogue.appendLiteral("{}\n],\n");
+ epilogue.appendLiteral("\"totals\": {\n");
+ epilogue.appendLiteral("\"count\": ");
+ epilogue.appendNumber(totals.count);
+ epilogue.appendLiteral(",\n");
+ epilogue.appendLiteral("\"bodySize\": ");
+ epilogue.appendNumber(totals.bodySize);
+ epilogue.appendLiteral(",\n");
+ epilogue.appendLiteral("\"averageWorth\": ");
+ epilogue.appendNumber(totals.count ? totals.worth / totals.count : 0);
+ epilogue.appendLiteral("\n");
+ epilogue.appendLiteral("}\n}\n");
+ auto writeData = epilogue.toString().utf8();
+ WebCore::writeToFile(fd, writeData.data(), writeData.length());
+ WebCore::closeFile(fd);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> auto entry = Entry::decodeStorageRecord(*record);
</span><span class="cx"> if (!entry)
</span><span class="cx"> return;
</span><ins>+ ++totals.count;
+ totals.worth += info.worth;
+ totals.bodySize += info.bodySize;
+
</ins><span class="cx"> StringBuilder json;
</span><del>- entry->asJSON(json);
- json.append(",\n");
</del><ins>+ entry->asJSON(json, info);
+ json.appendLiteral(",\n");
</ins><span class="cx"> auto writeData = json.toString().utf8();
</span><del>- WebCore::writeToFile(dumpFileHandle, writeData.data(), writeData.length());
</del><ins>+ WebCore::writeToFile(fd, writeData.data(), writeData.length());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -144,12 +144,18 @@
</span><span class="cx"> m_response.setSource(WebCore::ResourceResponse::Source::DiskCacheAfterValidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Entry::asJSON(StringBuilder& json) const
</del><ins>+void Entry::asJSON(StringBuilder& json, const Storage::RecordInfo& info) const
</ins><span class="cx"> {
</span><span class="cx"> json.appendLiteral("{\n");
</span><span class="cx"> json.appendLiteral("\"hash\": ");
</span><span class="cx"> JSC::appendQuotedJSONStringToBuilder(json, m_key.hashAsString());
</span><span class="cx"> json.appendLiteral(",\n");
</span><ins>+ json.appendLiteral("\"bodySize\": ");
+ json.appendNumber(info.bodySize);
+ json.appendLiteral(",\n");
+ json.appendLiteral("\"worth\": ");
+ json.appendNumber(info.worth);
+ json.appendLiteral(",\n");
</ins><span class="cx"> json.appendLiteral("\"partition\": ");
</span><span class="cx"> JSC::appendQuotedJSONStringToBuilder(json, m_key.partition());
</span><span class="cx"> json.appendLiteral(",\n");
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> const Storage::Record& sourceStorageRecord() const { return m_sourceStorageRecord; }
</span><span class="cx">
</span><del>- void asJSON(StringBuilder&) const;
</del><ins>+ void asJSON(StringBuilder&, const Storage::RecordInfo&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Entry(const Storage::Record&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> static const char networkCacheSubdirectory[] = "WebKitCache";
</span><span class="cx"> static const char versionDirectoryPrefix[] = "Version ";
</span><span class="cx">
</span><ins>+static double computeRecordWorth(FileTimes);
+
</ins><span class="cx"> std::unique_ptr<Storage> Storage::open(const String& cachePath)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -425,27 +427,33 @@
</span><span class="cx"> dispatchPendingWriteOperations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::traverse(std::function<void (const Record*)>&& traverseHandler)
</del><ins>+void Storage::traverse(TraverseFlags flags, std::function<void (const Record*, const RecordInfo&)>&& traverseHandler)
</ins><span class="cx"> {
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><del>- ioQueue().dispatch([this, cachePathCapture, traverseHandler] {
</del><ins>+ ioQueue().dispatch([this, flags, cachePathCapture, traverseHandler] {
</ins><span class="cx"> String cachePath = cachePathCapture.string();
</span><del>- traverseCacheFiles(cachePath, [this, &traverseHandler](const String& fileName, const String& partitionPath) {
</del><ins>+ traverseCacheFiles(cachePath, [this, flags, &traverseHandler](const String& fileName, const String& partitionPath) {
</ins><span class="cx"> auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
</span><ins>+
+ RecordInfo info;
+ if (flags & TraverseFlag::ComputeWorth)
+ info.worth = computeRecordWorth(fileTimes(filePath));
+
</ins><span class="cx"> auto channel = IOChannel::open(filePath, IOChannel::Type::Read);
</span><span class="cx"> const size_t headerReadSize = 16 << 10;
</span><span class="cx"> // FIXME: Traversal is slower than it should be due to lack of parallelism.
</span><del>- channel->readSync(0, headerReadSize, [this, &traverseHandler](Data& fileData, int) {
</del><ins>+ channel->readSync(0, headerReadSize, [this, &traverseHandler, &info](Data& fileData, int) {
</ins><span class="cx"> RecordMetaData metaData;
</span><span class="cx"> Data headerData;
</span><span class="cx"> if (decodeRecordHeader(fileData, metaData, headerData)) {
</span><span class="cx"> Record record { metaData.key, metaData.timeStamp, headerData, { } };
</span><del>- traverseHandler(&record);
</del><ins>+ info.bodySize = metaData.bodySize;
+ traverseHandler(&record, info);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> RunLoop::main().dispatch([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">@@ -583,10 +591,8 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double deletionProbability(FileTimes times)
</del><ins>+static double computeRecordWorth(FileTimes times)
</ins><span class="cx"> {
</span><del>- static const double maximumProbability { 0.33 };
-
</del><span class="cx"> using namespace std::chrono;
</span><span class="cx"> auto age = system_clock::now() - times.creation;
</span><span class="cx"> // File modification time is updated manually on cache read. We don't use access time since OS may update it automatically.
</span><span class="lines">@@ -594,15 +600,23 @@
</span><span class="cx">
</span><span class="cx"> // For sanity.
</span><span class="cx"> if (age <= seconds::zero() || accessAge < seconds::zero() || accessAge > age)
</span><del>- return maximumProbability;
</del><ins>+ return 1;
</ins><span class="cx">
</span><span class="cx"> // We like old entries that have been accessed recently.
</span><del>- auto relativeValue = duration<double>(accessAge) / age;
</del><ins>+ return duration<double>(accessAge) / age;
+}
</ins><span class="cx">
</span><ins>+
+static double deletionProbability(FileTimes times)
+{
+ static const double maximumProbability { 0.33 };
+
+ auto worth = computeRecordWorth(times);
+
</ins><span class="cx"> // Adjust a bit so the most valuable entries don't get deleted at all.
</span><del>- auto effectiveValue = std::min(1.1 * relativeValue, 1.);
</del><ins>+ auto effectiveWorth = std::min(1.1 * worth, 1.);
</ins><span class="cx">
</span><del>- return (1 - effectiveValue) * maximumProbability;
</del><ins>+ return (1 - effectiveWorth) * maximumProbability;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Storage::shrinkIfNeeded()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (182135 => 182136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-30 07:25:10 UTC (rev 182135)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-30 12:22:24 UTC (rev 182136)
</span><span class="lines">@@ -63,8 +63,16 @@
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span><span class="cx">
</span><del>- // Null entry signals end.
- void traverse(std::function<void (const Record*)>&&);
</del><ins>+ struct RecordInfo {
+ size_t bodySize { 0 };
+ double worth { -1 }; // 0-1 where 1 is the most valuable.
+ };
+ enum TraverseFlag {
+ ComputeWorth = 1 << 0,
+ };
+ typedef unsigned TraverseFlags;
+ // Null record signals end.
+ void traverse(TraverseFlags, std::function<void (const Record*, const RecordInfo&)>&&);
</ins><span class="cx">
</span><span class="cx"> void setMaximumSize(size_t);
</span><span class="cx"> void clear();
</span></span></pre>
</div>
</div>
</body>
</html>