Changeset 280618 in webkit

Timestamp:

Aug 3, 2021, 3:17:14 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Narrow set of terminated simulator processes
​https://bugs.webkit.org/show_bug.cgi?id=228752
<rdar://problem/81479508>

Reviewed by Alexey Proskuryakov.

• Scripts/webkitpy/xcode/simulated_device.py:

(SimulatedDeviceManager.initialize_devices): Only check Simulator.app.
(SimulatedDeviceManager.tear_down): Only kill Simulator.app processes.
(SimulatedDevice._delete): Print error if simctl delete fails, but continue.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/xcode/simulated_device.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-03  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Narrow set of terminated simulator processes
+        https://bugs.webkit.org/show_bug.cgi?id=228752
+        <rdar://problem/81479508>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager.initialize_devices): Only check Simulator.app.
+        (SimulatedDeviceManager.tear_down): Only kill Simulator.app processes.
+        (SimulatedDevice._delete): Print error if `simctl delete` fails, but continue.
+
 2021-08-03  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py

@@ -423 +423 @@
             SimulatedDeviceManager._boot_device(device, host)
 
-        if simulator_ui and host.executive.run_command(['killall', '-0', 'Simulator'], return_exit_code=True) != 0:
+        if simulator_ui and host.executive.run_command(['killall', '-0', 'Simulator.app'], return_exit_code=True) != 0:
             SimulatedDeviceManager._managing_simulator_app = not host.executive.run_command(['open', '-g', '-b', SimulatedDeviceManager.simulator_bundle_id, '--args', '-PasteboardAutomaticSync', '0'], return_exit_code=True)
 
@@ -490 +490 @@
         host = host or SystemHost()
         if SimulatedDeviceManager._managing_simulator_app:
-            host.executive.run_command(['killall', '-9', 'Simulator'], return_exit_code=True)
+            host.executive.run_command(['killall', '-9', 'Simulator.app'], return_exit_code=True)
             SimulatedDeviceManager._managing_simulator_app = False
 
@@ -505 +505 @@
 
         SimulatedDeviceManager.INITIALIZED_DEVICES = None
-
-        if SimulatedDeviceManager._managing_simulator_app:
-            for pid in host.executive.running_pids(lambda name: 'CoreSimulator.framework' in name):
-                host.executive.kill_process(pid)
 
         # If we were managing the simulator, there are some cache files we need to remove
@@ -608 +604 @@
         self._shut_down(deadline - time.time())
         _log.debug(u"Removing device '{}'".format(self.name))
-        self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'delete', self.udid])
+        if self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'delete', self.udid], return_exit_code=True):
+            _log.error(u"Failed to remove '{},' error is not fatal, continuing".format(self.name))
 
         # This will (by design) fail if run more than once on the same SimulatedDevice