Changeset 220942 in webkit

Timestamp:

Aug 18, 2017 4:26:40 PM (7 years ago)

Author:

Jonathan Bedard

Message:

Fix leak-checking for iOS Simulators
​https://bugs.webkit.org/show_bug.cgi?id=175735

Reviewed by Darin Adler.

If the leak checking currently occurs in ServerProcess, we can’t check leaks on an iOS
Simulator (or device) because the process will have already been killed by the time we
check for leaks. Duplicate leak-checking code and share code waiting on a process to stop.

• Scripts/webkitpy/port/server_process.py:

(ServerProcess.stop): Move code waiting for the process to close to _wait_for_stop(...).
(ServerProcess._wait_for_stop): Share code shutting down a process between ServerProcess
and SimulatorProcess.

• Scripts/webkitpy/port/simulator_process.py:

(SimulatorProcess.stop): Before closing the process, check for leaks.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-18  Jonathan Bedard  <jbedard@apple.com>
+
+        Fix leak-checking for iOS Simulators
+        https://bugs.webkit.org/show_bug.cgi?id=175735
+
+        Reviewed by Darin Adler.
+
+        If the leak checking currently occurs in ServerProcess, we can’t check leaks on an iOS
+        Simulator (or device) because the process will have already been killed by the time we
+        check for leaks. Duplicate leak-checking code and share code waiting on a process to stop.
+
+        * Scripts/webkitpy/port/server_process.py:
+        (ServerProcess.stop): Move code waiting for the process to close to _wait_for_stop(...).
+        (ServerProcess._wait_for_stop): Share code shutting down a process between ServerProcess
+        and SimulatorProcess.
+        * Scripts/webkitpy/port/simulator_process.py:
+        (SimulatorProcess.stop): Before closing the process, check for leaks.
+
 2017-08-18  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -349 +349 @@
             self._port.check_for_leaks(self.process_name(), self.pid())
 
-        now = time.time()
         if self._proc.stdin:
             self._proc.stdin.close()
             self._proc.stdin = None
+
+        return self._wait_for_stop(timeout_secs)
+
+    def _wait_for_stop(self, timeout_secs=3.0):
+        now = time.time()
         killed = False
         if timeout_secs:

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

@@ -117 +117 @@
 
     def stop(self, timeout_secs=3.0):
+        # Only bother to check for leaks or stderr if the process is still running.
+        if self.poll() is None:
+            self._port.check_for_leaks(self.process_name(), self.pid())
+
         if self._proc and self._proc.pid:
             self._target_host.executive.kill_process(self._proc.pid)
-        return super(SimulatorProcess, self).stop(timeout_secs)
+
+        return self._wait_for_stop(timeout_secs)