Attachment 342820 Details for Bug 186663 – Patch

[patch] Patch

bug-186663-20180615190132.patch (text/plain), 4.93 KB, created by Carlos Alberto Lopez Perez on 2018-06-15 10:01:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2018-06-15 10:01:33 PDT

Size: 4.93 KB

patch

obsolete

>Subversion Revision: 232870
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a8877685739076ee70fdf83555a26adcbb8ab07e..9ea02d4df1fe8d4bfa4b8db2c13848b420ca6d39 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+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 NOBODY (OOPS!).
>+
>+        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-14  Youenn Fablet  <youenn@apple.com>
> 
>         Make NetworkProcess get cache storage parameters at creation of the CacheStorage engine
>diff --git a/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp b/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp
>index e62c82ab0198600258d5b79992b110b62d1ac6d4..adedb98358608291e94bce8f1508875d95d5a719 100644
>--- a/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp
>+++ b/Source/WebKit/UIProcess/gtk/WebProcessPoolGtk.cpp
>@@ -97,6 +97,10 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
>     if (forceComplexText && !strcmp(forceComplexText, "0"))
>         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();
> #endif
>diff --git a/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp b/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp
>index 2c99e631473adca8011f6909d3a9da29289540e8..7cb8951abed7c2d465d54880ed497410b34b403a 100644
>--- a/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp
>+++ b/Source/WebKit/UIProcess/wpe/WebProcessPoolWPE.cpp
>@@ -93,6 +93,11 @@ WTF::String WebProcessPool::legacyPlatformDefaultMediaCacheDirectory()
> void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
> {
>     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();
> #endif
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5f401386257755b7d087a375fccb382504100ea9..f4fca5e74be26306e12c3323725b689a3848ba53 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        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-14  Saam Barati  <sbarati@apple.com>
> 
>         sun spider compile time benchmark fails in run-jsc-benchmarks with JSC_validateOptions=1
>diff --git a/Tools/WebKitTestRunner/gtk/main.cpp b/Tools/WebKitTestRunner/gtk/main.cpp
>index e2915253f18272a5887debff2422ac093a35b584..741ab1ee5959618d43f3c90204be630be5c6b04f 100644
>--- a/Tools/WebKitTestRunner/gtk/main.cpp
>+++ b/Tools/WebKitTestRunner/gtk/main.cpp
>@@ -33,6 +33,7 @@
> int main(int argc, char** argv)
> {
>     g_setenv("WEBKIT_FORCE_COMPLEX_TEXT", "0", FALSE);
>+    g_setenv("WEBKIT_DISABLE_MEMORY_PRESSURE_MONITOR", "1", FALSE);
> 
>     gtk_init(&argc, &argv);
> 
>diff --git a/Tools/WebKitTestRunner/wpe/main.cpp b/Tools/WebKitTestRunner/wpe/main.cpp
>index 6cf2b7ff321c5652bebe3b5d48b01474c95b800a..61aed89377df95c03b8b97cffd35c75ea9f6de0d 100644
>--- a/Tools/WebKitTestRunner/wpe/main.cpp
>+++ b/Tools/WebKitTestRunner/wpe/main.cpp
>@@ -29,6 +29,8 @@
> 
> 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;
> }

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186663: 342820