<!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>[177738] 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/177738">177738</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-25 13:09:40 -0800 (Thu, 25 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Log better using FeatureCounter why PageCache is failing due to pruned resources
https://bugs.webkit.org/show_bug.cgi?id=139921
Reviewed by Gavin Barraclough and Alexey Proskuryakov.
Source/WebCore:
Log better using FeatureCounter why PageCache is failing due to pruned
resources. In particular, we now distinguish if the resource was pruned
due to:
- Memory pressure
- Page cache capacity reached
- WebProcess suspended (WK2)
* WebCore.exp.in:
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
* history/HistoryItem.h:
* history/PageCache.cpp:
(WebCore::PageCache::pruneToCapacityNow):
(WebCore::PageCache::setCapacity):
(WebCore::pruningReasonToFeatureCounterKey):
(WebCore::PageCache::add):
(WebCore::PageCache::take):
(WebCore::PageCache::get):
(WebCore::PageCache::prune):
* history/PageCache.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad):
* platform/FeatureCounterKeys.h:
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::releaseCriticalMemory):
Source/WebKit2:
Call PageCache::pruneToCapacityNow() instead of multiple calls to
setCapacity() as it does exactly what we want. Also pass the new
PrunedReason argument so help us do better logging.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::releasePageCache):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCorehistoryPageCacheh">trunk/Source/WebCore/history/PageCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/ChangeLog 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-12-25 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log better using FeatureCounter why PageCache is failing due to pruned resources
+ https://bugs.webkit.org/show_bug.cgi?id=139921
+
+ Reviewed by Gavin Barraclough and Alexey Proskuryakov.
+
+ Log better using FeatureCounter why PageCache is failing due to pruned
+ resources. In particular, we now distinguish if the resource was pruned
+ due to:
+ - Memory pressure
+ - Page cache capacity reached
+ - WebProcess suspended (WK2)
+
+ * WebCore.exp.in:
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem):
+ * history/HistoryItem.h:
+ * history/PageCache.cpp:
+ (WebCore::PageCache::pruneToCapacityNow):
+ (WebCore::PageCache::setCapacity):
+ (WebCore::pruningReasonToFeatureCounterKey):
+ (WebCore::PageCache::add):
+ (WebCore::PageCache::take):
+ (WebCore::PageCache::get):
+ (WebCore::PageCache::prune):
+ * history/PageCache.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::commitProvisionalLoad):
+ * platform/FeatureCounterKeys.h:
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::releaseCriticalMemory):
+
</ins><span class="cx"> 2014-12-25 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr<> in WebCore/dom, plugin, and graphics
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -1559,6 +1559,7 @@
</span><span class="cx"> __ZN7WebCore9LayerPoolC1Ev
</span><span class="cx"> __ZN7WebCore9LayerPoolD1Ev
</span><span class="cx"> __ZN7WebCore9PageCache11setCapacityEi
</span><ins>+__ZN7WebCore9PageCache18pruneToCapacityNowEiNS_13PruningReasonE
</ins><span class="cx"> __ZN7WebCore9PageCache33markPagesForVistedLinkStyleRecalcEv
</span><span class="cx"> __ZN7WebCore9PageCache6removeEPNS_11HistoryItemE
</span><span class="cx"> __ZN7WebCore9PageGroup16syncLocalStorageEv
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> , m_isTargetItem(false)
</span><span class="cx"> , m_itemSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><del>- , m_next(0)
- , m_prev(0)
- , m_wasPruned(false)
</del><ins>+ , m_next(nullptr)
+ , m_prev(nullptr)
+ , m_pruningReason(PruningReason::None)
</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">@@ -81,9 +81,9 @@
</span><span class="cx"> , m_isTargetItem(false)
</span><span class="cx"> , m_itemSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><del>- , m_next(0)
- , m_prev(0)
- , m_wasPruned(false)
</del><ins>+ , m_next(nullptr)
+ , m_prev(nullptr)
+ , m_pruningReason(PruningReason::None)
</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,9 +103,9 @@
</span><span class="cx"> , m_isTargetItem(false)
</span><span class="cx"> , m_itemSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><del>- , m_next(0)
- , m_prev(0)
- , m_wasPruned(false)
</del><ins>+ , m_next(nullptr)
+ , m_prev(nullptr)
+ , m_pruningReason(PruningReason::None)
</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">@@ -126,9 +126,9 @@
</span><span class="cx"> , m_isTargetItem(false)
</span><span class="cx"> , m_itemSequenceNumber(generateSequenceNumber())
</span><span class="cx"> , m_documentSequenceNumber(generateSequenceNumber())
</span><del>- , m_next(0)
- , m_prev(0)
- , m_wasPruned(false)
</del><ins>+ , m_next(nullptr)
+ , m_prev(nullptr)
+ , m_pruningReason(PruningReason::None)
</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">@@ -160,6 +160,9 @@
</span><span class="cx"> , m_itemSequenceNumber(item.m_itemSequenceNumber)
</span><span class="cx"> , m_documentSequenceNumber(item.m_documentSequenceNumber)
</span><span class="cx"> , m_formContentType(item.m_formContentType)
</span><ins>+ , m_next(nullptr)
+ , m_prev(nullptr)
+ , m_pruningReason(PruningReason::None)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scale(item.m_scale)
</span><span class="cx"> , m_scaleIsInitial(item.m_scaleIsInitial)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/history/HistoryItem.h 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> class Image;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class URL;
</span><ins>+enum class PruningReason;
</ins><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<HistoryItem>> HistoryItemVector;
</span><span class="cx">
</span><span class="lines">@@ -258,7 +259,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><del>- bool m_wasPruned;
</del><ins>+ PruningReason m_pruningReason;
</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 (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/history/PageCache.cpp 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "SharedWorkerRepository.h"
</span><span class="cx"> #include "SubframeLoader.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/TemporaryChange.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx">
</span><span class="lines">@@ -370,11 +371,10 @@
</span><span class="cx"> || loadType == FrameLoadType::IndexedBackForward);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageCache::pruneToCapacityNow(int capacity)
</del><ins>+void PageCache::pruneToCapacityNow(int capacity, PruningReason pruningReason)
</ins><span class="cx"> {
</span><del>- int savedCapacity = m_capacity;
- setCapacity(capacity);
- setCapacity(savedCapacity);
</del><ins>+ TemporaryChange<int>(m_capacity, std::max(capacity, 0));
+ prune(pruningReason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageCache::setCapacity(int capacity)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> ASSERT(capacity >= 0);
</span><span class="cx"> m_capacity = std::max(capacity, 0);
</span><span class="cx">
</span><del>- prune();
</del><ins>+ prune(PruningReason::None);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int PageCache::frameCount() const
</span><span class="lines">@@ -433,6 +433,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static const char* pruningReasonToFeatureCounterKey(PruningReason pruningReason)
+{
+ switch (pruningReason) {
+ case PruningReason::MemoryPressure:
+ return FeatureCounterPageCacheFailurePrunedMemoryPressureKey;
+ case PruningReason::ProcessSuspended:
+ return FeatureCounterPageCacheFailurePrunedProcessedSuspendedKey;
+ case PruningReason::ReachedCapacity:
+ return FeatureCounterPageCacheFailurePrunedCapacityReachedKey;
+ case PruningReason::None:
+ ASSERT_NOT_REACHED();
+ return nullptr;
+ }
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
</ins><span class="cx"> void PageCache::add(PassRefPtr<HistoryItem> prpItem, Page& page)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(prpItem);
</span><span class="lines">@@ -445,11 +462,11 @@
</span><span class="cx"> remove(item);
</span><span class="cx">
</span><span class="cx"> item->m_cachedPage = std::make_unique<CachedPage>(page);
</span><del>- item->m_wasPruned = false;
</del><ins>+ item->m_pruningReason = PruningReason::None;
</ins><span class="cx"> addToLRUList(item);
</span><span class="cx"> ++m_size;
</span><span class="cx">
</span><del>- prune();
</del><ins>+ prune(PruningReason::ReachedCapacity);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CachedPage> PageCache::take(HistoryItem* item, Page* page)
</span><span class="lines">@@ -465,8 +482,8 @@
</span><span class="cx"> item->deref(); // Balanced in add().
</span><span class="cx">
</span><span class="cx"> if (!cachedPage) {
</span><del>- if (item->m_wasPruned)
- FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureWasPrunedKey);
</del><ins>+ if (item->m_pruningReason != PruningReason::None)
+ FEATURE_COUNTER_INCREMENT_KEY(page, pruningReasonToFeatureCounterKey(item->m_pruningReason));
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -491,8 +508,8 @@
</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>- } else if (item->m_wasPruned)
- FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureWasPrunedKey);
</del><ins>+ } else if (item->m_pruningReason != PruningReason::None)
+ FEATURE_COUNTER_INCREMENT_KEY(page, pruningReasonToFeatureCounterKey(item->m_pruningReason));
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -510,11 +527,11 @@
</span><span class="cx"> item->deref(); // Balanced in add().
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageCache::prune()
</del><ins>+void PageCache::prune(PruningReason pruningReason)
</ins><span class="cx"> {
</span><span class="cx"> while (m_size > m_capacity) {
</span><span class="cx"> ASSERT(m_tail && m_tail->m_cachedPage);
</span><del>- m_tail->m_wasPruned = true;
</del><ins>+ m_tail->m_pruningReason = pruningReason;
</ins><span class="cx"> remove(m_tail);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.h (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.h 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/history/PageCache.h 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class HistoryItem;
</span><span class="cx"> class Page;
</span><ins>+
+ enum class PruningReason { None, ProcessSuspended, MemoryPressure, ReachedCapacity };
</ins><span class="cx">
</span><span class="cx"> class PageCache {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PageCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -62,7 +64,7 @@
</span><span class="cx"> void markPagesForFullStyleRecalc(Page*);
</span><span class="cx">
</span><span class="cx"> // Used when memory is low to prune some cached pages.
</span><del>- void pruneToCapacityNow(int capacity);
</del><ins>+ WEBCORE_EXPORT void pruneToCapacityNow(int capacity, PruningReason);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void markPagesForCaptionPreferencesChanged();
</span><span class="lines">@@ -81,7 +83,7 @@
</span><span class="cx"> void addToLRUList(HistoryItem*); // Adds to the head of the list.
</span><span class="cx"> void removeFromLRUList(HistoryItem*);
</span><span class="cx">
</span><del>- void prune();
</del><ins>+ void prune(PruningReason);
</ins><span class="cx">
</span><span class="cx"> int m_capacity;
</span><span class="cx"> int m_size;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -1766,11 +1766,11 @@
</span><span class="cx"> LOG(MemoryPressure, "Pruning page cache because under memory pressure at: %s", __PRETTY_FUNCTION__);
</span><span class="cx"> LOG(PageCache, "Pruning page cache to 0 due to memory pressure");
</span><span class="cx"> // Don't cache any page if we are under memory pressure.
</span><del>- pageCache()->pruneToCapacityNow(0);
</del><ins>+ pageCache()->pruneToCapacityNow(0, PruningReason::MemoryPressure);
</ins><span class="cx"> } else if (systemMemoryLevel() <= memoryLevelThresholdToPrunePageCache) {
</span><span class="cx"> LOG(MemoryPressure, "Pruning page cache because system memory level is %d at: %s", systemMemoryLevel(), __PRETTY_FUNCTION__);
</span><span class="cx"> LOG(PageCache, "Pruning page cache to %d due to low memory (level %d less or equal to %d threshold)", pageCache()->capacity() / 2, systemMemoryLevel(), memoryLevelThresholdToPrunePageCache);
</span><del>- pageCache()->pruneToCapacityNow(pageCache()->capacity() / 2);
</del><ins>+ pageCache()->pruneToCapacityNow(pageCache()->capacity() / 2, PruningReason::MemoryPressure);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -59,7 +59,9 @@
</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><del>-static const char FeatureCounterPageCacheFailureWasPrunedKey[] = "com.apple.WebKit.pageCache.failure.wasPruned";
</del><ins>+static const char FeatureCounterPageCacheFailurePrunedMemoryPressureKey[] = "com.apple.WebKit.pageCache.failure.pruned.memoryPressure";
+static const char FeatureCounterPageCacheFailurePrunedCapacityReachedKey[] = "com.apple.WebKit.pageCache.failure.pruned.capacityReached";
+static const char FeatureCounterPageCacheFailurePrunedProcessedSuspendedKey[] = "com.apple.WebKit.pageCache.failure.pruned.processSuspended";
</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>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="cx"> ReliefLogger log("Empty the PageCache");
</span><del>- int savedPageCacheCapacity = pageCache()->capacity();
- pageCache()->setCapacity(0);
- pageCache()->setCapacity(savedPageCacheCapacity);
</del><ins>+ // Right now, the only reason we call release critical memory while not under memory pressure is if the process is about to be suspended.
+ PruningReason pruningReason = memoryPressureHandler().isUnderMemoryPressure() ? PruningReason::MemoryPressure : PruningReason::ProcessSuspended;
+ pageCache()->pruneToCapacityNow(0, pruningReason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-25 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log better using FeatureCounter why PageCache is failing due to pruned resources
+ https://bugs.webkit.org/show_bug.cgi?id=139921
+
+ Reviewed by Gavin Barraclough and Alexey Proskuryakov.
+
+ Call PageCache::pruneToCapacityNow() instead of multiple calls to
+ setCapacity() as it does exactly what we want. Also pass the new
+ PrunedReason argument so help us do better logging.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::releasePageCache):
+
</ins><span class="cx"> 2014-12-25 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177712 and r177717.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177737 => 177738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-25 18:55:21 UTC (rev 177737)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-25 21:09:40 UTC (rev 177738)
</span><span class="lines">@@ -1128,9 +1128,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::releasePageCache()
</span><span class="cx"> {
</span><del>- int savedPageCacheCapacity = pageCache()->capacity();
- pageCache()->setCapacity(0);
- pageCache()->setCapacity(savedPageCacheCapacity);
</del><ins>+ pageCache()->pruneToCapacityNow(0, PruningReason::MemoryPressure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>