<!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>[214473] 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/214473">214473</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 07:06:49 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitpy: Use host pattern for devices
https://bugs.webkit.org/show_bug.cgi?id=170121
Reviewed by Daniel Bates.
Devices should be treated like hosts throughout webkitpy
so that more code can be re-used. Add the needed properties
and use executive over custom implemented polling/killing
functions.
* Scripts/webkitpy/port/device.py:
(Device):
(Device.executive): Add optional executive property.
(Device.filesystem): Add optional filesystem property.
(Device.user): Add optional user property.
(Device.platform): Add optional platform property.
(Device.workspace): Add optional workspace property.
(Device.poll): Deleted.
* Scripts/webkitpy/port/simulator_process.py:
(SimulatorProcess.Popen.poll): Use the devices executive.
(SimulatorProcess.stop): Ditto.
(SimulatorProcess._kill): Ditto.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.__init__): Add executive, filesystem, user, platform
and workspace to the platform device.
(SimulatedDevice.poll): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdevicepy">trunk/Tools/Scripts/webkitpy/port/device.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportsimulator_processpy">trunk/Tools/Scripts/webkitpy/port/simulator_process.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulated_devicepy">trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214472 => 214473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-28 11:56:52 UTC (rev 214472)
+++ trunk/Tools/ChangeLog 2017-03-28 14:06:49 UTC (rev 214473)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-03-28 Jonathan Bedard <jbedard@apple.com>
+
+ webkitpy: Use host pattern for devices
+ https://bugs.webkit.org/show_bug.cgi?id=170121
+
+ Reviewed by Daniel Bates.
+
+ Devices should be treated like hosts throughout webkitpy
+ so that more code can be re-used. Add the needed properties
+ and use executive over custom implemented polling/killing
+ functions.
+
+ * Scripts/webkitpy/port/device.py:
+ (Device):
+ (Device.executive): Add optional executive property.
+ (Device.filesystem): Add optional filesystem property.
+ (Device.user): Add optional user property.
+ (Device.platform): Add optional platform property.
+ (Device.workspace): Add optional workspace property.
+ (Device.poll): Deleted.
+ * Scripts/webkitpy/port/simulator_process.py:
+ (SimulatorProcess.Popen.poll): Use the devices executive.
+ (SimulatorProcess.stop): Ditto.
+ (SimulatorProcess._kill): Ditto.
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDevice.__init__): Add executive, filesystem, user, platform
+ and workspace to the platform device.
+ (SimulatedDevice.poll): Deleted.
+
</ins><span class="cx"> 2017-03-28 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Dashboard test fails with error: latestIterationGetter is not a function
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdevicepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/device.py (214472 => 214473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/device.py 2017-03-28 11:56:52 UTC (rev 214472)
+++ trunk/Tools/Scripts/webkitpy/port/device.py 2017-03-28 14:06:49 UTC (rev 214473)
</span><span class="lines">@@ -31,11 +31,27 @@
</span><span class="cx"> def launch_app(self, bundle_id, args, env=None):
</span><span class="cx"> return self.platform_device.launch_app(bundle_id, args, env)
</span><span class="cx">
</span><del>- # FIXME: This should be implemented through an executive
- def poll(self, pid):
- return self.platform_device.poll(pid)
</del><ins>+ @property
+ def executive(self):
+ return self.platform_device.executive
</ins><span class="cx">
</span><span class="cx"> @property
</span><ins>+ def filesystem(self):
+ return self.platform_device.filesystem
+
+ @property
+ def user(self):
+ return self.platform_device.user
+
+ @property
+ def platform(self):
+ return self.platform_device.platform
+
+ @property
+ def workspace(self):
+ return self.platform_device.workspace
+
+ @property
</ins><span class="cx"> def udid(self):
</span><span class="cx"> return self.platform_device.udid
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportsimulator_processpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/simulator_process.py (214472 => 214473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2017-03-28 11:56:52 UTC (rev 214472)
+++ trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2017-03-28 14:06:49 UTC (rev 214473)
</span><span class="lines">@@ -21,13 +21,11 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx">
</span><del>-import errno
</del><span class="cx"> import os
</span><span class="cx"> import signal
</span><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> from webkitpy.port.server_process import ServerProcess
</span><del>-from webkitpy.xcode.simulator import Simulator
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> class SimulatorProcess(ServerProcess):
</span><span class="lines">@@ -45,7 +43,10 @@
</span><span class="cx"> def poll(self):
</span><span class="cx"> if self.returncode:
</span><span class="cx"> return self.returncode
</span><del>- self.returncode = self._device.poll(self.pid)
</del><ins>+ if self._device.executive.check_running_pid(self.pid):
+ self.returncode = None
+ else:
+ self.returncode = 1
</ins><span class="cx"> return self.returncode
</span><span class="cx">
</span><span class="cx"> def wait(self):
</span><span class="lines">@@ -125,9 +126,11 @@
</span><span class="cx"> self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr, self._device)
</span><span class="cx">
</span><span class="cx"> def stop(self, timeout_secs=3.0):
</span><del>- try:
- os.kill(self._pid, signal.SIGTERM)
- except OSError as err:
- assert err.errno == errno.ESRCH
- pass
</del><ins>+ if self._proc:
+ self._device.executive.kill_process(self._proc.pid)
</ins><span class="cx"> return super(SimulatorProcess, self).stop(timeout_secs)
</span><ins>+
+ def _kill(self):
+ self._device.executive.kill_process(self._proc.pid)
+ if self._proc.poll() is not None:
+ self._proc.wait()
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulated_devicepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (214472 => 214473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2017-03-28 11:56:52 UTC (rev 214472)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2017-03-28 14:06:49 UTC (rev 214473)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
</span><span class="cx"> # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-import errno
-import os
</del><span class="cx"> import logging
</span><span class="cx"> import re
</span><span class="cx"> import signal
</span><span class="lines">@@ -57,6 +55,12 @@
</span><span class="cx"> self.name = name
</span><span class="cx"> self.udid = udid
</span><span class="cx">
</span><ins>+ self.executive = host.executive
+ self.filesystem = host.filesystem
+ self.user = None
+ self.platform = host.platform
+ self.workspace = host.workspace
+
</ins><span class="cx"> @property
</span><span class="cx"> def state(self):
</span><span class="cx"> """
</span><span class="lines">@@ -180,7 +184,7 @@
</span><span class="cx"> )
</span><span class="cx"> match = re.match(r'(?P<bundle>[^:]+): (?P<pid>\d+)\n', output)
</span><span class="cx"> # FIXME: We shouldn't need to check the PID <rdar://problem/31154075>.
</span><del>- if match and self.poll(int(match.group('pid'))) is None:
</del><ins>+ if match and self.executive.check_running_pid(int(match.group('pid'))):
</ins><span class="cx"> break
</span><span class="cx">
</span><span class="cx"> signal.alarm(0) # Cancel alarm
</span><span class="lines">@@ -189,14 +193,6 @@
</span><span class="cx"> raise RuntimeError('Failed to find process id for {}: {}'.format(bundle_id, output))
</span><span class="cx"> return int(match.group('pid'))
</span><span class="cx">
</span><del>- def poll(self, pid):
- try:
- os.kill(pid, 0)
- except OSError as err:
- assert err.errno == errno.ESRCH
- return 1
- return None
-
</del><span class="cx"> def __eq__(self, other):
</span><span class="cx"> return self.udid == other.udid
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>