<!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>[278332] 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/278332">278332</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-06-01 16:23:21 -0700 (Tue, 01 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[run-webkit-tests] Move helper out of Port instance
https://bugs.webkit.org/show_bug.cgi?id=226344
<rdar://problem/78575542>

Reviewed by Dewei Zhu.

The "helper" is a popen object, which are not pickleable, and cannot
belong to an instantiated port object.

* Scripts/webkitpy/port/base.py:
(Port): Make helper class variable.
(Port.__init__):
(Port.stop_helper): All classes should share the same code to stop the helper process.
* Scripts/webkitpy/port/mac.py:
(MacPort.start_helper): Use class variable.
(MacPort.stop_helper): Moved to base class..</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (278331 => 278332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-06-01 22:36:56 UTC (rev 278331)
+++ trunk/Tools/ChangeLog       2021-06-01 23:23:21 UTC (rev 278332)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-06-01  Jonathan Bedard  <jbedard@apple.com>
+
+        [run-webkit-tests] Move helper out of Port instance
+        https://bugs.webkit.org/show_bug.cgi?id=226344
+        <rdar://problem/78575542>
+
+        Reviewed by Dewei Zhu.
+
+        The "helper" is a popen object, which are not pickleable, and cannot
+        belong to an instantiated port object.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port): Make helper class variable.
+        (Port.__init__):
+        (Port.stop_helper): All classes should share the same code to stop the helper process.
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.start_helper): Use class variable.
+        (MacPort.stop_helper): Moved to base class..
+
</ins><span class="cx"> 2021-06-01  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         Sync Tools/win/DLLLauncher/DLLLauncherMain.cpp with Source/JavaScriptCore/shell/DLLLauncherMain.cpp
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (278331 => 278332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2021-06-01 22:36:56 UTC (rev 278331)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py    2021-06-01 23:23:21 UTC (rev 278332)
</span><span class="lines">@@ -575,7 +575,6 @@
</span><span class="cx">             return False
</span><span class="cx"> 
</span><span class="cx">         _log.debug("Restarting helper")
</span><del>-        self._port.stop_helper()
</del><span class="cx">         self._options.pixel_tests = True
</span><span class="cx">         return self._port.start_helper(prefer_integrated_gpu=self._options.prefer_integrated_gpu)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (278331 => 278332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py        2021-06-01 22:36:56 UTC (rev 278331)
+++ trunk/Tools/Scripts/webkitpy/port/base.py   2021-06-01 23:23:21 UTC (rev 278332)
</span><span class="lines">@@ -81,6 +81,8 @@
</span><span class="cx">     DEVICE_TYPE = None
</span><span class="cx">     DEFAULT_DEVICE_TYPES = []
</span><span class="cx"> 
</span><ins>+    helper = None
+
</ins><span class="cx">     @classmethod
</span><span class="cx">     def determine_full_port_name(cls, host, options, port_name):
</span><span class="cx">         """Return a fully-specified port name that can be used to construct objects."""
</span><span class="lines">@@ -115,7 +117,6 @@
</span><span class="cx">         self._config = port_config.Config(self._executive, self._filesystem, self.port_name)
</span><span class="cx">         self.pretty_patch = PrettyPatch(self._executive, self.path_from_webkit_base(), self._filesystem)
</span><span class="cx"> 
</span><del>-        self._helper = None
</del><span class="cx">         self._http_server = None
</span><span class="cx">         self._websocket_server = None
</span><span class="cx">         self._websocket_secure_server = None
</span><span class="lines">@@ -958,9 +959,16 @@
</span><span class="cx"> 
</span><span class="cx">     def stop_helper(self):
</span><span class="cx">         """Shut down the test helper if it is running. Do nothing if
</span><del>-        it isn't, or it isn't available. If a port overrides start_helper()
-        it must override this routine as well."""
-        pass
</del><ins>+        it isn't, or it isn't available."""
+        if Port.helper:
+            _log.debug("Stopping LayoutTestHelper")
+            try:
+                Port.helper.stdin.write(b"x\n")
+                Port.helper.stdin.close()
+                Port.helper.wait()
+            except IOError as e:
+                _log.debug("IOError raised while stopping helper: %s" % str(e))
+            Port.helper = None
</ins><span class="cx"> 
</span><span class="cx">     def stop_http_server(self):
</span><span class="cx">         """Shut down the http server if it is running. Do nothing if it isn't."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (278331 => 278332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2021-06-01 22:36:56 UTC (rev 278331)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py    2021-06-01 23:23:21 UTC (rev 278332)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><span class="cx"> from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE
</span><span class="cx"> from webkitpy.common.version_name_map import VersionNameMap
</span><ins>+from webkitpy.port.base import Port
</ins><span class="cx"> from webkitpy.port.config import apple_additions, Config
</span><span class="cx"> from webkitpy.port.darwin import DarwinPort
</span><span class="cx"> 
</span><span class="lines">@@ -245,6 +246,8 @@
</span><span class="cx">         return min(supportable_instances, default_count)
</span><span class="cx"> 
</span><span class="cx">     def start_helper(self, pixel_tests=False, prefer_integrated_gpu=False):
</span><ins>+        self.stop_helper()
+
</ins><span class="cx">         helper_path = self._path_to_helper()
</span><span class="cx">         if not helper_path:
</span><span class="cx">             _log.error("No path to LayoutTestHelper binary")
</span><span class="lines">@@ -253,9 +256,9 @@
</span><span class="cx">         arguments = [helper_path, '--install-color-profile']
</span><span class="cx">         if prefer_integrated_gpu:
</span><span class="cx">             arguments.append('--prefer-integrated-gpu')
</span><del>-        self._helper = self._executive.popen(arguments,
</del><ins>+        Port.helper = self._executive.popen(arguments,
</ins><span class="cx">             stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
</span><del>-        is_ready = self._helper.stdout.readline()
</del><ins>+        is_ready = Port.helper.stdout.readline()
</ins><span class="cx">         if not is_ready.startswith(b'ready'):
</span><span class="cx">             _log.error("LayoutTestHelper could not start")
</span><span class="cx">             return False
</span><span class="lines">@@ -272,17 +275,6 @@
</span><span class="cx">                 if e.exit_code != 1:
</span><span class="cx">                     raise e
</span><span class="cx"> 
</span><del>-    def stop_helper(self):
-        if self._helper:
-            _log.debug("Stopping LayoutTestHelper")
-            try:
-                self._helper.stdin.write(b"x\n")
-                self._helper.stdin.close()
-                self._helper.wait()
-            except IOError as e:
-                _log.debug("IOError raised while stopping helper: %s" % str(e))
-            self._helper = None
-
</del><span class="cx">     def logging_patterns_to_strip(self):
</span><span class="cx">         logging_patterns = []
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>