Merge pull request #1340 from filipe-norte-red/wpe-2.38-service-worker-pressure-settings

Add dedicated memory pressure settings for service worker process

Author: magomez

Source/WTF/wtf/MemoryPressureHandler.cpp

@@ -297,7 +297,7 @@ void MemoryPressureHandler::setMemoryUsagePolicyBasedOnFootprints(size_t footpri
     if (newPolicy == m_memoryUsagePolicy)
         return;
 
-    RELEASE_LOG(MemoryPressure, "Memory usage policy changed: %s -> %s", toString(m_memoryUsagePolicy), toString(newPolicy));
+    RELEASE_LOG(MemoryPressure, "Memory usage policy changed (PID=%d): %s -> %s", getpid(), toString(m_memoryUsagePolicy), toString(newPolicy));
     m_memoryUsagePolicy = newPolicy;
     memoryPressureStatusChanged();
 }
@@ -307,7 +307,7 @@ void MemoryPressureHandler::measurementTimerFired()
     size_t footprint = memoryFootprint();
     size_t footprintVideo = memoryFootprintVideo();
 #if PLATFORM(COCOA)
-    RELEASE_LOG(MemoryPressure, "Current memory footprint: %zu MB", footprint / MB);
+    RELEASE_LOG(MemoryPressure, "Current memory footprint (PID=%d): %zu MB", getpid(), footprint / MB);
 #endif
     auto killThreshold = thresholdForMemoryKill(MemoryType::Normal);
     auto killThresholdVideo = thresholdForMemoryKill(MemoryType::Video);
@@ -385,13 +385,31 @@ void MemoryPressureHandler::setConfiguration(Configuration&& configuration)
     m_configuration = WTFMove(configuration);
     if (s_envBaseThresholdVideo)
         m_configuration.baseThresholdVideo = s_envBaseThresholdVideo;
+
+    RELEASE_LOG(MemoryPressure, "New memory pressure settings (PID=%d): bt=%u, btv=%u, ctf=%lf, stf=%lf, ktf=%lf, pi=%lf",
+        getpid(),
+        m_configuration.baseThreshold, 
+        m_configuration.baseThresholdVideo, 
+        m_configuration.conservativeThresholdFraction, 
+        m_configuration.strictThresholdFraction,
+        m_configuration.killThresholdFraction ? *(m_configuration.killThresholdFraction) : -1.0,
+        m_configuration.pollInterval.value());         
 }
 
 void MemoryPressureHandler::setConfiguration(const Configuration& configuration)
 {
     m_configuration = configuration;
     if (s_envBaseThresholdVideo)
         m_configuration.baseThresholdVideo = s_envBaseThresholdVideo;
+
+    RELEASE_LOG(MemoryPressure, "New memory pressure settings (PID=%d): bt=%u, btv=%u, ctf=%lf, stf=%lf, ktf=%lf, pi=%lf",
+        getpid(),
+        m_configuration.baseThreshold, 
+        m_configuration.baseThresholdVideo, 
+        m_configuration.conservativeThresholdFraction, 
+        m_configuration.strictThresholdFraction,
+        m_configuration.killThresholdFraction ? *(m_configuration.killThresholdFraction) : -1.0,
+        m_configuration.pollInterval.value());         
 }
 
 void MemoryPressureHandler::releaseMemory(Critical critical, Synchronous synchronous)

Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -79,6 +79,7 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
 #endif
 #if PLATFORM(GTK) || PLATFORM(WPE)
     copy->m_memoryPressureHandlerConfiguration = this->m_memoryPressureHandlerConfiguration;
+    copy->m_serviceWorkerMemoryPressureHandlerConfiguration = this->m_serviceWorkerMemoryPressureHandlerConfiguration;
 #endif
 #if HAVE(AUDIT_TOKEN)
     copy->m_presentingApplicationProcessToken = this->m_presentingApplicationProcessToken;

Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

@@ -159,6 +159,9 @@ class ProcessPoolConfiguration final : public ObjectImpl<Object::Type::ProcessPo
 #if PLATFORM(GTK) || PLATFORM(WPE)
     void setMemoryPressureHandlerConfiguration(const MemoryPressureHandler::Configuration& configuration) { m_memoryPressureHandlerConfiguration = configuration; }
     const std::optional<MemoryPressureHandler::Configuration>& memoryPressureHandlerConfiguration() const { return m_memoryPressureHandlerConfiguration; }
+
+    void setServiceWorkerMemoryPressureHandlerConfiguration(const MemoryPressureHandler::Configuration& configuration) { m_serviceWorkerMemoryPressureHandlerConfiguration = configuration; }
+    const std::optional<MemoryPressureHandler::Configuration>& serviceWorkerMemoryPressureHandlerConfiguration() const { return m_serviceWorkerMemoryPressureHandlerConfiguration; }
 #endif
 
     void setTimeZoneOverride(const WTF::String& timeZoneOverride) { m_timeZoneOverride = timeZoneOverride; }
@@ -201,6 +204,7 @@ class ProcessPoolConfiguration final : public ObjectImpl<Object::Type::ProcessPo
 #endif
 #if PLATFORM(GTK) || PLATFORM(WPE)
     std::optional<MemoryPressureHandler::Configuration> m_memoryPressureHandlerConfiguration;
+    std::optional<MemoryPressureHandler::Configuration> m_serviceWorkerMemoryPressureHandlerConfiguration;
 #endif
 #if HAVE(AUDIT_TOKEN)
     std::optional<audit_token_t> m_presentingApplicationProcessToken;

Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

@@ -130,6 +130,7 @@ enum {
 #endif
     PROP_MEMORY_PRESSURE_SETTINGS,
     PROP_TIME_ZONE_OVERRIDE,
+    PROP_SERVICE_WORKER_MEMORY_PRESSURE_SETTINGS,
     N_PROPERTIES,
 };
 
@@ -248,6 +249,7 @@ struct _WebKitWebContextPrivate {
     PAL::HysteresisActivity dnsPrefetchHystereris;
 
     WebKitMemoryPressureSettings* memoryPressureSettings;
+    WebKitMemoryPressureSettings* serviceWorkerMemoryPressureSettings;
 
     CString timeZoneOverride;
 };
@@ -393,6 +395,11 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
         context->priv->memoryPressureSettings = settings ? webkit_memory_pressure_settings_copy(static_cast<WebKitMemoryPressureSettings*>(settings)) : nullptr;
         break;
     }
+    case PROP_SERVICE_WORKER_MEMORY_PRESSURE_SETTINGS: {
+        gpointer settings = g_value_get_boxed(value);
+        context->priv->serviceWorkerMemoryPressureSettings = settings ? webkit_memory_pressure_settings_copy(static_cast<WebKitMemoryPressureSettings*>(settings)) : nullptr;
+        break;
+    }
     case PROP_TIME_ZONE_OVERRIDE: {
         const auto* timeZone = g_value_get_string(value);
         if (isTimeZoneValid(StringView::fromLatin1(timeZone)))
@@ -430,6 +437,11 @@ static void webkitWebContextConstructed(GObject* object)
         // Once the settings have been passed to the ProcessPoolConfiguration, we don't need them anymore so we can free them.
         g_clear_pointer(&priv->memoryPressureSettings, webkit_memory_pressure_settings_free);
     }
+    if (priv->serviceWorkerMemoryPressureSettings) {
+        configuration.setServiceWorkerMemoryPressureHandlerConfiguration(webkitMemoryPressureSettingsGetMemoryPressureHandlerConfiguration(priv->serviceWorkerMemoryPressureSettings));
+        // Once the settings have been passed to the ProcessPoolConfiguration, we don't need them anymore so we can free them.
+        g_clear_pointer(&priv->serviceWorkerMemoryPressureSettings, webkit_memory_pressure_settings_free);
+    }
     configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.data(), priv->timeZoneOverride.length()));
 
     if (!priv->websiteDataManager)
@@ -593,6 +605,21 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass
             WEBKIT_TYPE_MEMORY_PRESSURE_SETTINGS,
             static_cast<GParamFlags>(WEBKIT_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
+    /**
+     * WebKitWebContext:service-worker-memory-pressure-settings:
+     *
+     * The #WebKitMemoryPressureSettings applied to the service worker web processes created by this context.
+     *
+     * Since: 2.38
+     */
+    sObjProperties[PROP_SERVICE_WORKER_MEMORY_PRESSURE_SETTINGS] =
+        g_param_spec_boxed(
+            "service-worker-memory-pressure-settings",
+            _("Service Worker Memory Pressure Settings"),
+            _("The WebKitMemoryPressureSettings applied to the service worker web processes created by this context"),
+            WEBKIT_TYPE_MEMORY_PRESSURE_SETTINGS,
+            static_cast<GParamFlags>(WEBKIT_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
     /**
      * WebKitWebContext:time-zone-override:
      *

Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp

@@ -116,7 +116,10 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
     parameters.useSystemAppearanceForScrollbars = m_configuration->useSystemAppearanceForScrollbars();
 #endif
 
-    parameters.memoryPressureHandlerConfiguration = m_configuration->memoryPressureHandlerConfiguration();
+    if (process.isRunningServiceWorkers() && m_configuration->serviceWorkerMemoryPressureHandlerConfiguration())
+        parameters.memoryPressureHandlerConfiguration = m_configuration->serviceWorkerMemoryPressureHandlerConfiguration();
+    else
+        parameters.memoryPressureHandlerConfiguration = m_configuration->memoryPressureHandlerConfiguration();
 
     GApplication* app = g_application_get_default();
     if (app)