<!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>[285627] trunk/Tools</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/285627">285627</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-11 06:55:29 -0800 (Thu, 11 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Flatpak] http server is not properly tear down
https://bugs.webkit.org/show_bug.cgi?id=221554

Patch by Philippe Normand <pnormand@igalia.com> on 2021-11-11
Reviewed by Adrian Perez de Castro.

In Linux when the layout tests are manually interrupted it might lead to Apache not being
cleanly stopped. On the next run it would then fail to start, usually failing to setup its
'scoreboard' with SHM. The proposed solution is to look for stale SHM segments, eg. segments
allocated but not attached to any process, and remove them, before starting the Apache
process.

* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd._remove_stale_shm_segments):
(LayoutTestApacheHttpd._spawn_process):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (285626 => 285627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-11-11 14:54:06 UTC (rev 285626)
+++ trunk/Tools/ChangeLog       2021-11-11 14:55:29 UTC (rev 285627)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2021-11-11  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><ins>+        [Flatpak] http server is not properly tear down
+        https://bugs.webkit.org/show_bug.cgi?id=221554
+
+        Reviewed by Adrian Perez de Castro.
+
+        In Linux when the layout tests are manually interrupted it might lead to Apache not being
+        cleanly stopped. On the next run it would then fail to start, usually failing to setup its
+        'scoreboard' with SHM. The proposed solution is to look for stale SHM segments, eg. segments
+        allocated but not attached to any process, and remove them, before starting the Apache
+        process.
+
+        * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+        (LayoutTestApacheHttpd._remove_stale_shm_segments):
+        (LayoutTestApacheHttpd._spawn_process):
+
+2021-11-11  Philippe Normand  <pnormand@igalia.com>
+
</ins><span class="cx">         [GTK][WPE] webkit-flatpak-run-nightly infinite self-call loop
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=230400
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (285626 => 285627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py  2021-11-11 14:54:06 UTC (rev 285626)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py     2021-11-11 14:55:29 UTC (rev 285627)
</span><span class="lines">@@ -179,7 +179,26 @@
</span><span class="cx">     def platform(self):
</span><span class="cx">         return self._port_obj.host.platform
</span><span class="cx"> 
</span><ins>+    def _remove_stale_shm_segments(self):
+        stale_segments = []
+        process = self._executive.popen(['ipcs', '-m'], stdout=self._executive.PIPE)
+        process.wait()
+        for line in process.stdout.read().splitlines()[3:]:
+            parsed_line = [token for token in line.split(b' ') if token]
+            if not parsed_line:
+                continue
+            if int(parsed_line[5]) == 0:
+                stale_segments.append(parsed_line[1].decode('utf-8'))
+
+        if stale_segments:
+            ipcrm_cmd = ['ipcrm', '-m', ' '.join(stale_segments)]
+            process = self._executive.popen(ipcrm_cmd)
+            process.wait()
+
</ins><span class="cx">     def _spawn_process(self):
</span><ins>+        if self.platform.is_linux():
+            self._remove_stale_shm_segments()
+
</ins><span class="cx">         _log.debug('Starting %s server, cmd="%s"' % (self._name, str(self._start_cmd)))
</span><span class="cx">         retval, err = self._run(self._start_cmd)
</span><span class="cx">         if retval or len(err):
</span></span></pre>
</div>
</div>

</body>
</html>