<!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>[236579] 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/236579">236579</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2018-09-27 17:50:28 -0700 (Thu, 27 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Increase the timeout for iOS Simulator data migration
https://bugs.webkit.org/show_bug.cgi?id=190059

Reviewed by Aakash Jain.

3 minutes isn't always enough time for the data migrator to complete
when booting up multiple iOS Simulators. Change the timeout to 10 minutes.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager): Create a constant for the default timeout.
(SimulatedDeviceManager.initialize_devices): Use new constant.
(SimulatedDeviceManager.swap): Ditto.
(SimulatedDeviceManager.wait_until_data_migration_is_done): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (236578 => 236579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-09-28 00:23:37 UTC (rev 236578)
+++ trunk/Tools/ChangeLog       2018-09-28 00:50:28 UTC (rev 236579)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-09-27  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Increase the timeout for iOS Simulator data migration
+        https://bugs.webkit.org/show_bug.cgi?id=190059
+
+        Reviewed by Aakash Jain.
+
+        3 minutes isn't always enough time for the data migrator to complete
+        when booting up multiple iOS Simulators. Change the timeout to 10 minutes.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager): Create a constant for the default timeout.
+        (SimulatedDeviceManager.initialize_devices): Use new constant.
+        (SimulatedDeviceManager.swap): Ditto.
+        (SimulatedDeviceManager.wait_until_data_migration_is_done): Ditto.
+
</ins><span class="cx"> 2018-09-27  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         URLParser should use TextEncoding through an abstract class
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulated_devicepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (236578 => 236579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py   2018-09-28 00:23:37 UTC (rev 236578)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py      2018-09-28 00:50:28 UTC (rev 236579)
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx">     AVAILABLE_DEVICES = []
</span><span class="cx">     INITIALIZED_DEVICES = None
</span><span class="cx"> 
</span><ins>+    SIMULATOR_BOOT_TIMEOUT = 600
+
</ins><span class="cx">     # FIXME: Simulators should only take up 2GB, but because of <rdar://problem/39393590> something in the OS thinks they're taking closer to 6GB
</span><span class="cx">     MEMORY_ESTIMATE_PER_SIMULATOR_INSTANCE = 6 * (1024 ** 3)  # 6GB a simulator.
</span><span class="cx">     PROCESS_COUNT_ESTIMATE_PER_SIMULATOR_INSTANCE = 125
</span><span class="lines">@@ -314,7 +316,7 @@
</span><span class="cx">         SimulatedDeviceManager.INITIALIZED_DEVICES.append(device)
</span><span class="cx"> 
</span><span class="cx">     @staticmethod
</span><del>-    def initialize_devices(requests, host=SystemHost(), name_base='Managed', simulator_ui=True, timeout=180, **kwargs):
</del><ins>+    def initialize_devices(requests, host=SystemHost(), name_base='Managed', simulator_ui=True, timeout=SIMULATOR_BOOT_TIMEOUT, **kwargs):
</ins><span class="cx">         if SimulatedDeviceManager.INITIALIZED_DEVICES is not None:
</span><span class="cx">             return SimulatedDeviceManager.INITIALIZED_DEVICES
</span><span class="cx"> 
</span><span class="lines">@@ -395,7 +397,7 @@
</span><span class="cx">         return min(max_supported_simulators_locally, max_supported_simulators_for_hardware)
</span><span class="cx"> 
</span><span class="cx">     @staticmethod
</span><del>-    def swap(device, request, host=SystemHost(), name_base='Managed', timeout=180):
</del><ins>+    def swap(device, request, host=SystemHost(), name_base='Managed', timeout=SIMULATOR_BOOT_TIMEOUT):
</ins><span class="cx">         if SimulatedDeviceManager.INITIALIZED_DEVICES is None:
</span><span class="cx">             raise RuntimeError('Cannot swap when there are no initialized devices')
</span><span class="cx">         if device not in SimulatedDeviceManager.INITIALIZED_DEVICES:
</span><span class="lines">@@ -419,7 +421,7 @@
</span><span class="cx">         SimulatedDeviceManager.wait_until_data_migration_is_done(host, max(0, deadline - time.time()))
</span><span class="cx"> 
</span><span class="cx">     @staticmethod
</span><del>-    def wait_until_data_migration_is_done(host, timeout=180):
</del><ins>+    def wait_until_data_migration_is_done(host, timeout=SIMULATOR_BOOT_TIMEOUT):
</ins><span class="cx">         # The existence of a datamigrator process means that simulators are still booting.
</span><span class="cx">         deadline = time.time() + timeout
</span><span class="cx">         _log.debug('Waiting until no com.apple.datamigrator processes are found')
</span></span></pre>
</div>
</div>

</body>
</html>