<!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>[284681] 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/284681">284681</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-10-22 07:38:42 -0700 (Fri, 22 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>StreamConnectionWorkQueue::processStreams() has a incorrect protection ref
https://bugs.webkit.org/show_bug.cgi?id=232070

Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2021-10-22
Reviewed by Wenson Hsieh.

* GPUProcess/graphics/RemoteRenderingBackend.cpp:
(WebKit::RemoteRenderingBackend::~RemoteRenderingBackend):
Additionally remove redundant protection ref from `RemoteRenderingBackend`
cleanup task. Since `m_workQueue->stop()` is run after dispatching the
task, and since `stop()` waits until queue has executed the
all the tasks, the `m_workQueue` ref outlives the protection ref.

* Platform/IPC/StreamConnectionWorkQueue.cpp:
(IPC::StreamConnectionWorkQueue::processStreams):
Remove the redundant protection ref so it does not cause confusion.
The protection ref cannot hold the last ref, as that would mean
that the `StreamConnectionWorkQueue` thread would run the code to
destroy the work queue itself. There has to be a external ref for
`queue->stop()` that outlives the protection ref, as the `stop()` will
wait until the queue thread stops.

(IPC::StreamConnectionWorkQueue::stopAndWaitForCompletion):
(IPC::StreamConnectionWorkQueue::stop): Deleted.
* Platform/IPC/StreamConnectionWorkQueue.h:
Rename `stop()` to `stopAndWaitForCompletion()` to signify what
the function does.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp">trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCStreamConnectionWorkQueuecpp">trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCStreamConnectionWorkQueueh">trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (284680 => 284681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-10-22 14:31:05 UTC (rev 284680)
+++ trunk/Source/WebKit/ChangeLog       2021-10-22 14:38:42 UTC (rev 284681)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2021-10-22  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        StreamConnectionWorkQueue::processStreams() has a incorrect protection ref
+        https://bugs.webkit.org/show_bug.cgi?id=232070
+
+        Reviewed by Wenson Hsieh.
+
+        * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+        (WebKit::RemoteRenderingBackend::~RemoteRenderingBackend):
+        Additionally remove redundant protection ref from `RemoteRenderingBackend`
+        cleanup task. Since `m_workQueue->stop()` is run after dispatching the
+        task, and since `stop()` waits until queue has executed the
+        all the tasks, the `m_workQueue` ref outlives the protection ref.
+
+        * Platform/IPC/StreamConnectionWorkQueue.cpp:
+        (IPC::StreamConnectionWorkQueue::processStreams):
+        Remove the redundant protection ref so it does not cause confusion.
+        The protection ref cannot hold the last ref, as that would mean
+        that the `StreamConnectionWorkQueue` thread would run the code to
+        destroy the work queue itself. There has to be a external ref for
+        `queue->stop()` that outlives the protection ref, as the `stop()` will
+        wait until the queue thread stops.
+
+        (IPC::StreamConnectionWorkQueue::stopAndWaitForCompletion):
+        (IPC::StreamConnectionWorkQueue::stop): Deleted.
+        * Platform/IPC/StreamConnectionWorkQueue.h:
+        Rename `stop()` to `stopAndWaitForCompletion()` to signify what
+        the function does.
+
</ins><span class="cx"> 2021-10-22  Alberto Garcia  <berto@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, fix typo in the WebKitWebInspector documentation.
</span></span></pre></div>
<a id="trunkSourceWebKitGPUProcessgraphicsRemoteRenderingBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (284680 => 284681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp       2021-10-22 14:31:05 UTC (rev 284680)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp  2021-10-22 14:38:42 UTC (rev 284681)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> {
</span><span class="cx">     // Make sure we destroy the ResourceCache on the WorkQueue since it gets populated on the WorkQueue.
</span><span class="cx">     // Make sure rendering resource request is released after destroying the cache.
</span><del>-    m_workQueue->dispatch([workQueue = m_workQueue.copyRef(), renderingResourcesRequest = WTFMove(m_renderingResourcesRequest), remoteResourceCache = WTFMove(m_remoteResourceCache)] { });
-    m_workQueue->stop();
</del><ins>+    m_workQueue->dispatch([renderingResourcesRequest = WTFMove(m_renderingResourcesRequest), remoteResourceCache = WTFMove(m_remoteResourceCache)] { });
+    m_workQueue->stopAndWaitForCompletion();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RemoteRenderingBackend::stopListeningForIPC()
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCStreamConnectionWorkQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp (284680 => 284681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp   2021-10-22 14:31:05 UTC (rev 284680)
+++ trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.cpp      2021-10-22 14:38:42 UTC (rev 284681)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> StreamConnectionWorkQueue::~StreamConnectionWorkQueue()
</span><span class="cx"> {
</span><del>-    // `StreamConnectionWorkQueue::stop()` should be called if anything has been dispatched or listened to.
</del><ins>+    // `StreamConnectionWorkQueue::stopAndWaitForCompletion()` should be called if anything has been dispatched or listened to.
</ins><span class="cx">     ASSERT(!m_processingThread);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">     wakeUp();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StreamConnectionWorkQueue::stop()
</del><ins>+void StreamConnectionWorkQueue::stopAndWaitForCompletion()
</ins><span class="cx"> {
</span><span class="cx">     m_shouldQuit = true;
</span><span class="cx">     RefPtr<Thread> processingThread;
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx"> 
</span><span class="cx"> void StreamConnectionWorkQueue::processStreams()
</span><span class="cx"> {
</span><del>-    Ref protectedThis = *this;
</del><span class="cx">     constexpr size_t defaultMessageLimit = 1000;
</span><span class="cx">     bool hasMoreToProcess = false;
</span><span class="cx">     do {
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCStreamConnectionWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h (284680 => 284681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h     2021-10-22 14:31:05 UTC (rev 284680)
+++ trunk/Source/WebKit/Platform/IPC/StreamConnectionWorkQueue.h        2021-10-22 14:38:42 UTC (rev 284681)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">     void removeStreamConnection(StreamServerConnectionBase&);
</span><span class="cx"> 
</span><span class="cx">     void dispatch(WTF::Function<void()>&&) final;
</span><del>-    void stop();
</del><ins>+    void stopAndWaitForCompletion();
</ins><span class="cx"> 
</span><span class="cx">     void wakeUp();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>