<!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>[182983] 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/182983">182983</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-18 07:42:08 -0700 (Sat, 18 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix NetworkCache Statistics database bootstrapping after <a href="http://trac.webkit.org/projects/webkit/changeset/182803">r182803</a>
https://bugs.webkit.org/show_bug.cgi?id=143890
Reviewed by Darin Adler.
Update the NetworkCache Statistics database bootstrapping code to use
the records path instead of the version path. Also check that the
filenames in the folder are valid hashes to discard the *-body files.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::recordsPath):
(WebKit::NetworkCache::Cache::storagePath): Deleted.
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
(WebKit::NetworkCache::Statistics::initialize):
(WebKit::NetworkCache::Statistics::bootstrapFromNetworkCache):
(WebKit::NetworkCache::Statistics::shrinkIfNeeded):</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182982 => 182983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-18 04:04:39 UTC (rev 182982)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-18 14:42:08 UTC (rev 182983)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-18 Chris Dumez <cdumez@apple.com>
+
+ Fix NetworkCache Statistics database bootstrapping after r182803
+ https://bugs.webkit.org/show_bug.cgi?id=143890
+
+ Reviewed by Darin Adler.
+
+ Update the NetworkCache Statistics database bootstrapping code to use
+ the records path instead of the version path. Also check that the
+ filenames in the folder are valid hashes to discard the *-body files.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::recordsPath):
+ (WebKit::NetworkCache::Cache::storagePath): Deleted.
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ (WebKit::NetworkCache::Statistics::initialize):
+ (WebKit::NetworkCache::Statistics::bootstrapFromNetworkCache):
+ (WebKit::NetworkCache::Statistics::shrinkIfNeeded):
+
</ins><span class="cx"> 2015-04-17 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Clients sometimes block for 500ms in waitForPossibleGeometryUpdates
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (182982 => 182983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-18 04:04:39 UTC (rev 182982)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-18 14:42:08 UTC (rev 182983)
</span><span class="lines">@@ -497,9 +497,9 @@
</span><span class="cx"> m_statistics->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Cache::storagePath() const
</del><ins>+String Cache::recordsPath() const
</ins><span class="cx"> {
</span><del>- return m_storage ? m_storage->versionPath() : String();
</del><ins>+ return m_storage ? m_storage->recordsPath() : String();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (182982 => 182983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-04-18 04:04:39 UTC (rev 182982)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-04-18 14:42:08 UTC (rev 182983)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> void dumpContentsToFile();
</span><span class="cx">
</span><del>- String storagePath() const;
</del><ins>+ String recordsPath() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Cache() = default;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (182982 => 182983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2015-04-18 04:04:39 UTC (rev 182982)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2015-04-18 14:42:08 UTC (rev 182983)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> auto startTime = std::chrono::system_clock::now();
</span><span class="cx">
</span><span class="cx"> StringCapture databasePathCapture(databasePath);
</span><del>- StringCapture networkCachePathCapture(singleton().storagePath());
</del><ins>+ StringCapture networkCachePathCapture(singleton().recordsPath());
</ins><span class="cx"> serialBackgroundIOQueue().dispatch([this, databasePathCapture, networkCachePathCapture, startTime] {
</span><span class="cx"> WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><span class="cx">
</span><span class="lines">@@ -144,8 +144,12 @@
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Bootstrapping the network cache statistics database from the network cache...");
</span><span class="cx">
</span><span class="cx"> Vector<StringCapture> hashes;
</span><del>- traverseCacheFiles(networkCachePath, [&hashes](const String& hash, const String&) {
- hashes.append(hash);
</del><ins>+ traverseCacheFiles(networkCachePath, [&hashes](const String& hashString, const String&) {
+ Key::HashType hash;
+ if (!Key::stringToHash(hashString, hash))
+ return;
+
+ hashes.append(hashString);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><span class="lines">@@ -169,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> clear();
</span><span class="cx">
</span><del>- StringCapture networkCachePathCapture(singleton().storagePath());
</del><ins>+ StringCapture networkCachePathCapture(singleton().recordsPath());
</ins><span class="cx"> serialBackgroundIOQueue().dispatch([this, networkCachePathCapture] {
</span><span class="cx"> bootstrapFromNetworkCache(networkCachePathCapture.string());
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) statistics cache shrink completed m_approximateEntryCount=%lu", static_cast<size_t>(m_approximateEntryCount));
</span></span></pre>
</div>
</div>
</body>
</html>