Changeset 215346 in webkit

Timestamp:

Apr 13, 2017 4:20:03 PM (7 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Ignore previously launched pid when system is under stress
​https://bugs.webkit.org/show_bug.cgi?id=170741

Reviewed by David Kilzer.

We have seen cases where xcrun simctl launch will return a pid of a previous
process and the process will appear to be running even though it is crashing.
Ensure that the PID that simulator_process is receiving is not the pid of the
previously run process.

• Scripts/webkitpy/port/simulator_process.py:

(SimulatorProcess._start): Check to make sure we aren't receiving an old PID.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/simulator_process.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-13  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Ignore previously launched pid when system is under stress
+        https://bugs.webkit.org/show_bug.cgi?id=170741
+
+        Reviewed by David Kilzer.
+
+        We have seen cases where xcrun simctl launch will return a pid of a previous
+        process and the process will appear to be running even though it is crashing.
+        Ensure that the PID that simulator_process is receiving is not the pid of the
+        previously run process.
+
+        * Scripts/webkitpy/port/simulator_process.py:
+        (SimulatorProcess._start): Check to make sure we aren't receiving an old PID.
+
 2017-04-13  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/simulator_process.py

@@ -91 +91 @@
         # 3 client connections will be accepted for stdin, stdout and stderr in that order.
         self._target_host.listening_socket.listen(3)
-        self._pid = self._target_host.launch_app(self._bundle_id, self._cmd[1:], env=self._env)
+
+        try:
+
+            def launch_failure_handler(signum, frame):
+                assert signum == signal.SIGALRM
+                raise RuntimeError('Faild to launch {}, kept receiving old PID'.format(os.path.basename(self._cmd[0])))
+
+            signal.signal(signal.SIGALRM, launch_failure_handler)
+            signal.alarm(300)  # In seconds
+            pid = self._pid
+            while pid == self._pid:
+                if pid:
+                    self._target_host.executive.kill_process(pid)
+                pid = self._target_host.launch_app(self._bundle_id, self._cmd[1:], env=self._env)
+            self._pid = pid
+        finally:
+            signal.alarm(0)
 
         def handler(signum, frame):
             assert signum == signal.SIGALRM
-            raise Exception('Timed out waiting for pid {} to connect at port {}'.format(self._pid, self._target_host.listening_port()))
+            raise RuntimeError('Timed out waiting for pid {} to connect at port {}'.format(self._pid, self._target_host.listening_port()))
         signal.signal(signal.SIGALRM, handler)
         signal.alarm(6)  # In seconds