Changeset 215470 in webkit

Timestamp:

Apr 18, 2017 10:34:22 AM (7 years ago)

Author:

Jonathan Bedard

Message:

Unreviewed, rolling out r215346 and 215361.

The problem these changes were fixing was addressed in
<​https://trac.webkit.org/changeset/215416/webkit>.

Reverted changesets:

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-18  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r215346 and 215361.
+
+        The problem these changes were fixing was addressed in
+        <https://trac.webkit.org/changeset/215416/webkit>.
+
+        Reverted changesets:
+
+        "webkitpy: Ignore previously launched pid when system is under
+        stress"
+        https://bugs.webkit.org/show_bug.cgi?id=170741
+        http://trac.webkit.org/changeset/215346
+        http://trac.webkit.org/changeset/215361
+
 2017-04-17  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -219 +219 @@
             if err:
                 self.error_from_test += err
+            self._server_process = None
 
         crash_log = None
@@ -369 +370 @@
         self._crashed_process_name = None
         self._crashed_pid = None
-        if self._server_process is None:
-            self._server_process = self._port._test_runner_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), environment, target_host=self._target_host)
+        self._server_process = self._port._test_runner_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), environment, target_host=self._target_host)
         self._server_process.start()
 
@@ -385 +385 @@
         if self._server_process:
             self._server_process.stop(self._port.driver_stop_timeout())
+            self._server_process = None
             if self._profiler:
                 self._profiler.profile_after_exit()

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)
-
-        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)
+        self._pid = self._target_host.launch_app(self._bundle_id, self._cmd[1:], env=self._env)
 
         def handler(signum, frame):