<!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>[177680] trunk/Source/WebCore</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/177680">177680</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-22 23:23:14 -0800 (Mon, 22 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Log using FeatureCounter when a PacheCache fails due to memory pressure
https://bugs.webkit.org/show_bug.cgi?id=139874
<rdar://problem/19255690>
Reviewed by Darin Adler.
Log using FeatureCounter when a PacheCache fails due to memory
pressure. To detect this, a flag is added to HistoryItem to mark
items that are no longer in the page becaused they were pruned
(either because of a low memory handling or because the page cache
reached its maximum capacity).
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
* history/HistoryItem.h:
* history/PageCache.cpp:
(WebCore::PageCache::add):
(WebCore::PageCache::take):
(WebCore::PageCache::get):
(WebCore::PageCache::prune):
* platform/FeatureCounterKeys.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemcpp">trunk/Source/WebCore/history/HistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemh">trunk/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177679 => 177680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-23 07:17:54 UTC (rev 177679)
+++ trunk/Source/WebCore/ChangeLog 2014-12-23 07:23:14 UTC (rev 177680)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-22 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log using FeatureCounter when a PacheCache fails due to memory pressure
+ https://bugs.webkit.org/show_bug.cgi?id=139874
+ <rdar://problem/19255690>
+
+ Reviewed by Darin Adler.
+
+ Log using FeatureCounter when a PacheCache fails due to memory
+ pressure. To detect this, a flag is added to HistoryItem to mark
+ items that are no longer in the page becaused they were pruned
+ (either because of a low memory handling or because the page cache
+ reached its maximum capacity).
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem):
+ * history/HistoryItem.h:
+ * history/PageCache.cpp:
+ (WebCore::PageCache::add):
+ (WebCore::PageCache::take):
+ (WebCore::PageCache::get):
+ (WebCore::PageCache::prune):
+ * platform/FeatureCounterKeys.h:
+
</ins><span class="cx"> 2014-12-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177658.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (177679 => 177680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2014-12-23 07:17:54 UTC (rev 177679)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2014-12-23 07:23:14 UTC (rev 177680)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_next(0)
</span><span class="cx"> , m_prev(0)
</span><ins>+ , m_wasPruned(false)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scale(0)
</span><span class="cx"> , m_scaleIsInitial(false)
</span><span class="lines">@@ -82,6 +83,7 @@
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_next(0)
</span><span class="cx"> , m_prev(0)
</span><ins>+ , m_wasPruned(false)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scale(0)
</span><span class="cx"> , m_scaleIsInitial(false)
</span><span class="lines">@@ -103,6 +105,7 @@
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_next(0)
</span><span class="cx"> , m_prev(0)
</span><ins>+ , m_wasPruned(false)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scale(0)
</span><span class="cx"> , m_scaleIsInitial(false)
</span><span class="lines">@@ -125,6 +128,7 @@
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_next(0)
</span><span class="cx"> , m_prev(0)
</span><ins>+ , m_wasPruned(false)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scale(0)
</span><span class="cx"> , m_scaleIsInitial(false)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (177679 => 177680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2014-12-23 07:17:54 UTC (rev 177679)
+++ trunk/Source/WebCore/history/HistoryItem.h 2014-12-23 07:23:14 UTC (rev 177680)
</span><span class="lines">@@ -258,6 +258,7 @@
</span><span class="cx"> HistoryItem* m_next;
</span><span class="cx"> HistoryItem* m_prev;
</span><span class="cx"> std::unique_ptr<CachedPage> m_cachedPage;
</span><ins>+ bool m_wasPruned;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FloatRect m_exposedContentRect;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (177679 => 177680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2014-12-23 07:17:54 UTC (rev 177679)
+++ trunk/Source/WebCore/history/PageCache.cpp 2014-12-23 07:23:14 UTC (rev 177680)
</span><span class="lines">@@ -445,6 +445,7 @@
</span><span class="cx"> remove(item);
</span><span class="cx">
</span><span class="cx"> item->m_cachedPage = std::make_unique<CachedPage>(page);
</span><ins>+ item->m_wasPruned = false;
</ins><span class="cx"> addToLRUList(item);
</span><span class="cx"> ++m_size;
</span><span class="cx">
</span><span class="lines">@@ -463,8 +464,11 @@
</span><span class="cx">
</span><span class="cx"> item->deref(); // Balanced in add().
</span><span class="cx">
</span><del>- if (!cachedPage)
</del><ins>+ if (!cachedPage) {
+ if (item->m_wasPruned)
+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureWasPrunedKey);
</ins><span class="cx"> return nullptr;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (cachedPage->hasExpired()) {
</span><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item->url().string().ascii().data());
</span><span class="lines">@@ -487,7 +491,9 @@
</span><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item->url().string().ascii().data());
</span><span class="cx"> FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureExpiredKey);
</span><span class="cx"> pageCache()->remove(item);
</span><del>- }
</del><ins>+ } else if (item->m_wasPruned)
+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureWasPrunedKey);
+
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -508,6 +514,7 @@
</span><span class="cx"> {
</span><span class="cx"> while (m_size > m_capacity) {
</span><span class="cx"> ASSERT(m_tail && m_tail->m_cachedPage);
</span><ins>+ m_tail->m_wasPruned = true;
</ins><span class="cx"> remove(m_tail);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (177679 => 177680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-23 07:17:54 UTC (rev 177679)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-23 07:23:14 UTC (rev 177680)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> static const char FeatureCounterPageCacheFailureReloadFromOriginKey[] = "com.apple.WebKit.pageCache.failure.reloadFromOrigin";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureSameLoadKey[] = "com.apple.WebKit.pageCache.failure.sameLoad";
</span><span class="cx"> static const char FeatureCounterPageCacheFailureExpiredKey[] = "com.apple.WebKit.pageCache.failure.expired";
</span><ins>+static const char FeatureCounterPageCacheFailureWasPrunedKey[] = "com.apple.WebKit.pageCache.failure.wasPruned";
</ins><span class="cx"> static const char FeatureCounterPageCacheFailureKey[] = "com.apple.WebKit.pageCache.failure";
</span><span class="cx"> static const char FeatureCounterPageCacheSuccessKey[] = "com.apple.WebKit.pageCache.success";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>