<!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>[179942] 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/179942">179942</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2015-02-11 12:09:13 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Activate ReliefLogger of a memory pressure handler for linux system.
https://bugs.webkit.org/show_bug.cgi?id=123611
Reviewed by Anders Carlsson.
Source/WebCore:
Put more logs for the time when a system goes under memory pressure or viceversa.
No new tests since no engine behavior changed.
* platform/linux/MemoryPressureHandlerLinux.cpp:
(WebCore::MemoryPressureHandler::waitForMemoryPressureEvent): Wait a memory pressure event
from cgroup in a seperated thread. Once a pressure event happens, respondToMemoryPressure()
would be called to get back some resources.
(WebCore::MemoryPressureHandler::install): Install memoryPressureHandler module
to make it work.
Source/WebKit2:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
Make the parameter, shouldEnableMemoryPressureReliefLogging shareable with COCOA else systems.
(WebKit::WebProcessCreationParameters::encode): ditto.
(WebKit::WebProcessCreationParameters::decode): ditto.
* Shared/WebProcessCreationParameters.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess): Set shouldEnableMemoryPressureReliefLogging
to true for linux system.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess): Pass the shouldEnableMemoryPressureReliefLogging value
to MemoryPressureHandler::ReliefLogger::setLoggingEnabled().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp">trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</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 (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebCore/ChangeLog 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-11 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Activate ReliefLogger of a memory pressure handler for linux system.
+ https://bugs.webkit.org/show_bug.cgi?id=123611
+
+ Reviewed by Anders Carlsson.
+
+ Put more logs for the time when a system goes under memory pressure or viceversa.
+
+ No new tests since no engine behavior changed.
+
+ * platform/linux/MemoryPressureHandlerLinux.cpp:
+ (WebCore::MemoryPressureHandler::waitForMemoryPressureEvent): Wait a memory pressure event
+ from cgroup in a seperated thread. Once a pressure event happens, respondToMemoryPressure()
+ would be called to get back some resources.
+ (WebCore::MemoryPressureHandler::install): Install memoryPressureHandler module
+ to make it work.
+
</ins><span class="cx"> 2015-02-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Final preparations to switch to WEBCORE_EXPORT.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -97,9 +97,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- memoryPressureHandler().m_underMemoryPressure = true;
- callOnMainThread([] {
- memoryPressureHandler().respondToMemoryPressure(true);
</del><ins>+ // FIXME: Current memcg does not provide any way for users to know how serious the memory pressure is.
+ // So we assume all notifications from memcg are critical for now. If memcg had better inferfaces
+ // to get a detailed memory pressure level in the future, we should update here accordingly.
+ bool critical = true;
+ if (ReliefLogger::loggingEnabled())
+ LOG(MemoryPressure, "Got memory pressure notification (%s)", critical ? "critical" : "non-critical");
+
+ memoryPressureHandler().setUnderMemoryPressure(critical);
+ callOnMainThread([critical] {
+ memoryPressureHandler().respondToMemoryPressure(critical);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,7 +163,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_underMemoryPressure = false;
</del><ins>+ if (ReliefLogger::loggingEnabled() && isUnderMemoryPressure())
+ LOG(MemoryPressure, "System is no longer under memory pressure.");
+
+ setUnderMemoryPressure(false);
</ins><span class="cx"> m_installed = true;
</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 (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-02-11 ChangSeok Oh <changseok.oh@collabora.com>
+
+ Activate ReliefLogger of a memory pressure handler for linux system.
+ https://bugs.webkit.org/show_bug.cgi?id=123611
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ Make the parameter, shouldEnableMemoryPressureReliefLogging shareable with COCOA else systems.
+ (WebKit::WebProcessCreationParameters::encode): ditto.
+ (WebKit::WebProcessCreationParameters::decode): ditto.
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess): Set shouldEnableMemoryPressureReliefLogging
+ to true for linux system.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess): Pass the shouldEnableMemoryPressureReliefLogging value
+ to MemoryPressureHandler::ReliefLogger::setLoggingEnabled().
+
</ins><span class="cx"> 2015-02-11 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL] Suppress a warning of unused params
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> WebProcessCreationParameters::WebProcessCreationParameters()
</span><span class="cx"> : shouldAlwaysUseComplexTextCodePath(false)
</span><ins>+ , shouldEnableMemoryPressureReliefLogging(false)
</ins><span class="cx"> , shouldUseFontSmoothing(true)
</span><span class="cx"> , defaultRequestTimeoutInterval(INT_MAX)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -41,7 +42,6 @@
</span><span class="cx"> , shouldEnableKerningAndLigaturesByDefault(false)
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><del>- , shouldEnableMemoryPressureReliefLogging(false)
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , usesNetworkProcess(false)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> encoder.encodeEnum(cacheModel);
</span><span class="cx"> encoder << shouldAlwaysUseComplexTextCodePath;
</span><ins>+ encoder << shouldEnableMemoryPressureReliefLogging;
</ins><span class="cx"> encoder << shouldUseFontSmoothing;
</span><span class="cx"> encoder << iconDatabaseEnabled;
</span><span class="cx"> encoder << terminationTimeout;
</span><span class="lines">@@ -121,7 +122,6 @@
</span><span class="cx"> encoder << shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> encoder << shouldEnableJIT;
</span><span class="cx"> encoder << shouldEnableFTLJIT;
</span><del>- encoder << shouldEnableMemoryPressureReliefLogging;
</del><span class="cx"> encoder << !!bundleParameterData;
</span><span class="cx"> if (bundleParameterData)
</span><span class="cx"> encoder << bundleParameterData->dataReference();
</span><span class="lines">@@ -220,6 +220,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldAlwaysUseComplexTextCodePath))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.shouldEnableMemoryPressureReliefLogging))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.shouldUseFontSmoothing))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.iconDatabaseEnabled))
</span><span class="lines">@@ -260,9 +262,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldEnableFTLJIT))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.shouldEnableMemoryPressureReliefLogging))
- return false;
-
</del><ins>+
</ins><span class="cx"> bool hasBundleParameterData;
</span><span class="cx"> if (!decoder.decode(hasBundleParameterData))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> CacheModel cacheModel;
</span><span class="cx">
</span><span class="cx"> bool shouldAlwaysUseComplexTextCodePath;
</span><ins>+ bool shouldEnableMemoryPressureReliefLogging;
</ins><span class="cx"> bool shouldUseFontSmoothing;
</span><span class="cx">
</span><span class="cx"> bool iconDatabaseEnabled;
</span><span class="lines">@@ -143,7 +144,6 @@
</span><span class="cx"> bool shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> bool shouldEnableJIT;
</span><span class="cx"> bool shouldEnableFTLJIT;
</span><del>- bool shouldEnableMemoryPressureReliefLogging;
</del><span class="cx">
</span><span class="cx"> RefPtr<API::Data> bundleParameterData;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -684,6 +684,10 @@
</span><span class="cx"> serviceController.refreshExistingServices();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if OS(LINUX)
+ parameters.shouldEnableMemoryPressureReliefLogging = true;
+#endif
+
</ins><span class="cx"> // Add any platform specific parameters
</span><span class="cx"> platformInitializeWebProcess(parameters);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (179941 => 179942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-11 19:44:07 UTC (rev 179941)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-11 20:09:13 UTC (rev 179942)
</span><span class="lines">@@ -276,6 +276,10 @@
</span><span class="cx"> m_usesNetworkProcess = parameters.usesNetworkProcess;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if OS(LINUX)
+ WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
+#endif
+
</ins><span class="cx"> platformInitializeWebProcess(WTF::move(parameters));
</span><span class="cx">
</span><span class="cx"> WTF::setCurrentThreadIsUserInitiated();
</span></span></pre>
</div>
</div>
</body>
</html>