Changeset 232881 in webkit

Timestamp:

Jun 15, 2018 10:35:30 AM (6 years ago)

Author:

clopez@igalia.com

Message:

[GTK][WKE] Disable memory pressure handling when running layout tests (WTR)
​https://bugs.webkit.org/show_bug.cgi?id=186663

Reviewed by Michael Catanzaro.

Source/WebKit:

r196943 added a mechanism to disable the memory pressure handling
on Mac. This patch enables using that mechanism also for GTK/WPE.
To do that the environment variable WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR
should bet set to 1.
We want to use this on the layout tests to avoid flaky tests caused
by accumulated leaks on the WebProcess by different tests.

• UIProcess/gtk/WebProcessPoolGtk.cpp:

(WebKit::WebProcessPool::platformInitializeWebProcess):

• UIProcess/wpe/WebProcessPoolWPE.cpp:

(WebKit::WebProcessPool::platformInitializeWebProcess):

Tools:

Disable memory pressure handling when running tests via WTR by
setting WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR=1 on the environment.

• WebKitTestRunner/gtk/main.cpp:

(main):

• WebKitTestRunner/wpe/main.cpp:

(main):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/gtk/main.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/wpe/main.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-06-15  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK][WKE] Disable memory pressure handling when running layout tests (WTR)
+        https://bugs.webkit.org/show_bug.cgi?id=186663
+
+        Reviewed by Michael Catanzaro.
+
+        r196943 added a mechanism to disable the memory pressure handling
+        on Mac. This patch enables using that mechanism also for GTK/WPE.
+        To do that the environment variable WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR
+        should bet set to 1.
+        We want to use this on the layout tests to avoid flaky tests caused
+        by accumulated leaks on the WebProcess by different tests.
+
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * UIProcess/wpe/WebProcessPoolWPE.cpp:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+
 2018-06-15  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp

@@ -98 +98 @@
         parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
 
+    const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
+    if (disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1"))
+        parameters.shouldSuppressMemoryPressureHandler = true;
+
 #if USE(GSTREAMER)
     parameters.gstreamerOptions = WebCore::extractGStreamerOptionsFromCommandLine();

trunk/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp

@@ -94 +94 @@
 {
     parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModelDocumentViewer;
+
+    const char* disableMemoryPressureMonitor = getenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR");
+    if (disableMemoryPressureMonitor && !strcmp(disableMemoryPressureMonitor, "1"))
+        parameters.shouldSuppressMemoryPressureHandler = true;
+
 #if USE(GSTREAMER)
     parameters.gstreamerOptions = WebCore::extractGStreamerOptionsFromCommandLine();

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-15  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK][WKE] Disable memory pressure handling when running layout tests (WTR)
+        https://bugs.webkit.org/show_bug.cgi?id=186663
+
+        Reviewed by Michael Catanzaro.
+
+        Disable memory pressure handling when running tests via WTR by
+        setting WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR=1 on the environment.
+
+        * WebKitTestRunner/gtk/main.cpp:
+        (main):
+        * WebKitTestRunner/wpe/main.cpp:
+        (main):
+
 2018-06-15  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/WebKitTestRunner/gtk/main.cpp

@@ -34 +34 @@
 {
     g_setenv("WEBKIT_FORCE_COMPLEX_TEXT", "0", FALSE);
+    g_setenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR", "1", FALSE);
 
     gtk_init(&argc, &argv);

trunk/Tools/WebKitTestRunner/wpe/main.cpp

@@ -27 +27 @@
 
 #include "TestController.h"
+#include <glib.h>
 
 int main(int argc, char** argv)
 {
+    g_setenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR", "1", FALSE);
+
     WTR::TestController controller(argc, const_cast<const char**>(argv));
     return 0;