Changeset 179942 in webkit

Timestamp:

Feb 11, 2015 12:09:13 PM (9 years ago)

Author:

ChangSeok Oh

Message:

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().

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebProcessCreationParameters.cpp (modified) (6 diffs)
• WebKit2/Shared/WebProcessCreationParameters.h (modified) (2 diffs)
• WebKit2/UIProcess/WebProcessPool.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2015-02-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp

@@ -98 +98 @@
     }
 
-    memoryPressureHandler().m_underMemoryPressure = true;
-    callOnMainThread([] {
-        memoryPressureHandler().respondToMemoryPressure(true);
+    // 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);
     });
 }
@@ -157 +164 @@
     }
 
-    m_underMemoryPressure = false;
+    if (ReliefLogger::loggingEnabled() && isUnderMemoryPressure())
+        LOG(MemoryPressure, "System is no longer under memory pressure.");
+
+    setUnderMemoryPressure(false);
     m_installed = true;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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().
+
 2015-02-11  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -34 +34 @@
 WebProcessCreationParameters::WebProcessCreationParameters()
     : shouldAlwaysUseComplexTextCodePath(false)
+    , shouldEnableMemoryPressureReliefLogging(false)
     , shouldUseFontSmoothing(true)
     , defaultRequestTimeoutInterval(INT_MAX)
@@ -42 +43 @@
     , shouldEnableJIT(false)
     , shouldEnableFTLJIT(false)
-    , shouldEnableMemoryPressureReliefLogging(false)
 #endif
 #if ENABLE(NETWORK_PROCESS)
@@ -101 +101 @@
     encoder.encodeEnum(cacheModel);
     encoder << shouldAlwaysUseComplexTextCodePath;
+    encoder << shouldEnableMemoryPressureReliefLogging;
     encoder << shouldUseFontSmoothing;
     encoder << iconDatabaseEnabled;
@@ -122 +123 @@
     encoder << shouldEnableJIT;
     encoder << shouldEnableFTLJIT;
-    encoder << shouldEnableMemoryPressureReliefLogging;
     encoder << !!bundleParameterData;
     if (bundleParameterData)
@@ -221 +221 @@
     if (!decoder.decode(parameters.shouldAlwaysUseComplexTextCodePath))
         return false;
+    if (!decoder.decode(parameters.shouldEnableMemoryPressureReliefLogging))
+        return false;
     if (!decoder.decode(parameters.shouldUseFontSmoothing))
         return false;
@@ -261 +263 @@
     if (!decoder.decode(parameters.shouldEnableFTLJIT))
         return false;
-    if (!decoder.decode(parameters.shouldEnableMemoryPressureReliefLogging))
-        return false;
-    
+
     bool hasBundleParameterData;
     if (!decoder.decode(hasBundleParameterData))

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -110 +110 @@
 
     bool shouldAlwaysUseComplexTextCodePath;
+    bool shouldEnableMemoryPressureReliefLogging;
     bool shouldUseFontSmoothing;
 
@@ -144 +145 @@
     bool shouldEnableJIT;
     bool shouldEnableFTLJIT;
-    bool shouldEnableMemoryPressureReliefLogging;
     
     RefPtr<API::Data> bundleParameterData;

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -685 +685 @@
 #endif
 
+#if OS(LINUX)
+    parameters.shouldEnableMemoryPressureReliefLogging = true;
+#endif
+
     // Add any platform specific parameters
     platformInitializeWebProcess(parameters);

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -277 +277 @@
 #endif
 
+#if OS(LINUX)
+    WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
+#endif
+
     platformInitializeWebProcess(WTF::move(parameters));