Changeset 249948 in webkit

Timestamp:

Sep 17, 2019 1:14:29 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

Keeps running obsolete WebProcess-es for too long
​https://bugs.webkit.org/show_bug.cgi?id=201492

Reviewed by Chris Dumez.

That's how the web process cache is expected to work, but it's true that it probably only makes sense to use it
when cache model is primary web browser.

• UIProcess/WebProcessCache.cpp:

(WebKit::WebProcessCache::updateCapacity): Disable the web process cache when cache model is not primary web browser.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessCache.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Keeps running obsolete WebProcess-es for too long
+        https://bugs.webkit.org/show_bug.cgi?id=201492
+
+        Reviewed by Chris Dumez.
+
+        That's how the web process cache is expected to work, but it's true that it probably only makes sense to use it
+        when cache model is primary web browser.
+
+        * UIProcess/WebProcessCache.cpp:
+        (WebKit::WebProcessCache::updateCapacity): Disable the web process cache when cache model is not primary web browser.
+
 2019-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/WebProcessCache.cpp

@@ -151 +151 @@
 void WebProcessCache::updateCapacity(WebProcessPool& processPool)
 {
-    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache()) {
+    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache() || processPool.cacheModel() != CacheModel::PrimaryWebBrowser) {
         if (!processPool.configuration().processSwapsOnNavigation())
             RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::updateCapacity: Cache is disabled because process swap on navigation is disabled", this);
+        else if (!processPool.configuration().usesWebProcessCache())
+            RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::updateCapacity: Cache is disabled by client", this);
         else
-            RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::updateCapacity: Cache is disabled by client", this);
+            RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::updateCapacity: Cache is disabled because cache model is not PrimaryWebBrowser", this);
         m_capacity = 0;
     } else {