<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279155] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279155">279155</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-06-22 16:48:33 -0700 (Tue, 22 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[macOS] Suspend WebProcesses that are in the process cache
https://bugs.webkit.org/show_bug.cgi?id=227269

Reviewed by Geoffrey Garen.

Suspend WebProcesses that are in the process cache on macOS to make sure they use no CPU.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::setIsInProcessCache):
(WebKit::WebProcessProxy::platformSuspendProcess):
(WebKit::WebProcessProxy::platformResumeProcess):
* UIProcess/WebProcessProxy.h:
* UIProcess/mac/WebProcessProxyMac.mm:
(WebKit::WebProcessProxy::platformSuspendProcess):
(WebKit::WebProcessProxy::platformResumeProcess):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setIsInProcessCache):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessProxycpp">trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessProxyh">trunk/Source/WebKit/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacWebProcessProxyMacmm">trunk/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcesscpp">trunk/Source/WebKit/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcessh">trunk/Source/WebKit/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcessmessagesin">trunk/Source/WebKit/WebProcess/WebProcess.messages.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/ChangeLog       2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-06-22  Chris Dumez  <cdumez@apple.com>
+
+        [macOS] Suspend WebProcesses that are in the process cache
+        https://bugs.webkit.org/show_bug.cgi?id=227269
+
+        Reviewed by Geoffrey Garen.
+
+        Suspend WebProcesses that are in the process cache on macOS to make sure they use no CPU.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::setIsInProcessCache):
+        (WebKit::WebProcessProxy::platformSuspendProcess):
+        (WebKit::WebProcessProxy::platformResumeProcess):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/mac/WebProcessProxyMac.mm:
+        (WebKit::WebProcessProxy::platformSuspendProcess):
+        (WebKit::WebProcessProxy::platformResumeProcess):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::setIsInProcessCache):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2021-06-22  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Further unreviewed build fix after r279133: remove even more things.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp        2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp   2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -283,8 +283,14 @@
</span><span class="cx">     ASSERT(m_isInProcessCache != value);
</span><span class="cx">     m_isInProcessCache = value;
</span><span class="cx"> 
</span><del>-    send(Messages::WebProcess::SetIsInProcessCache(m_isInProcessCache), 0);
</del><ins>+    if (!m_isInProcessCache)
+        platformResumeProcess();
</ins><span class="cx"> 
</span><ins>+    sendWithAsyncReply(Messages::WebProcess::SetIsInProcessCache(m_isInProcessCache), [weakThis = makeWeakPtr(*this), isEnteringProcessCache = value]() mutable {
+        if (isEnteringProcessCache && weakThis && weakThis->m_isInProcessCache)
+            weakThis->platformSuspendProcess();
+    });
+
</ins><span class="cx">     if (m_isInProcessCache) {
</span><span class="cx">         // WebProcessProxy objects normally keep the process pool alive but we do not want this to be the case
</span><span class="cx">         // for cached processes or it would leak the pool.
</span><span class="lines">@@ -1954,6 +1960,16 @@
</span><span class="cx">     PAL::systemBeep();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(MAC)
+void WebProcessProxy::platformSuspendProcess()
+{
+}
+
+void WebProcessProxy::platformResumeProcess()
+{
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> #undef MESSAGE_CHECK
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h  2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h     2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -471,6 +471,9 @@
</span><span class="cx"> 
</span><span class="cx">     void processDidTerminateOrFailedToLaunch(ProcessTerminationReason);
</span><span class="cx"> 
</span><ins>+    void platformSuspendProcess();
+    void platformResumeProcess();
+
</ins><span class="cx">     // IPC::Connection::Client
</span><span class="cx">     friend class WebConnectionToWebProcess;
</span><span class="cx">     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm  2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm     2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "WKFullKeyboardAccessWatcher.h"
</span><span class="cx"> #import <Kernel/kern/cs_blobs.h>
</span><ins>+#import <signal.h>
</ins><span class="cx"> #import <wtf/ProcessPrivilege.h>
</span><span class="cx"> #import <wtf/spi/cocoa/SecuritySPI.h>
</span><span class="cx"> 
</span><span class="lines">@@ -78,6 +79,24 @@
</span><span class="cx">     processPool().setDisplayLinkPreferredFramesPerSecond(*connection(), observerID, displayID, preferredFramesPerSecond);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebProcessProxy::platformSuspendProcess()
+{
+    RELEASE_LOG(Process, "%p - [PID=%i] WebProcessProxy::platformSuspendProcess", this, processIdentifier());
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    if (auto* connection = this->connection())
+        xpc_connection_kill(connection->xpcConnection(), SIGSTOP);
+    ALLOW_DEPRECATED_DECLARATIONS_END
+}
+
+void WebProcessProxy::platformResumeProcess()
+{
+    RELEASE_LOG(Process, "%p - [PID=%i] WebProcessProxy::platformResumeProcess", this, processIdentifier());
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+    if (auto* connection = this->connection())
+        xpc_connection_kill(connection->xpcConnection(), SIGCONT);
+    ALLOW_DEPRECATED_DECLARATIONS_END
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.cpp    2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp       2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx">     m_hasSuspendedPageProxy = hasSuspendedPageProxy;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcess::setIsInProcessCache(bool isInProcessCache)
</del><ins>+void WebProcess::setIsInProcessCache(bool isInProcessCache, CompletionHandler<void()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     if (isInProcessCache) {
</span><span class="lines">@@ -620,6 +620,8 @@
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(isInProcessCache);
</span><span class="cx"> #endif
</span><ins>+
+    completionHandler();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebProcess::markIsNoLongerPrewarmed()
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.h      2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx">     void platformTerminate();
</span><span class="cx"> 
</span><span class="cx">     void setHasSuspendedPageProxy(bool);
</span><del>-    void setIsInProcessCache(bool);
</del><ins>+    void setIsInProcessCache(bool, CompletionHandler<void()>&&);
</ins><span class="cx">     void markIsNoLongerPrewarmed();
</span><span class="cx"> 
</span><span class="cx">     void registerURLSchemeAsEmptyDocument(const String&);
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (279154 => 279155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in    2021-06-22 22:06:54 UTC (rev 279154)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in       2021-06-22 23:48:33 UTC (rev 279155)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     SetHasSuspendedPageProxy(bool hasSuspendedPageProxy);
</span><del>-    SetIsInProcessCache(bool isInProcessCache)
</del><ins>+    SetIsInProcessCache(bool isInProcessCache) -> () Async
</ins><span class="cx">     MarkIsNoLongerPrewarmed()
</span><span class="cx">     GetActivePagesOriginsForTesting() -> (Vector<String> activeOrigins) Async
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>