Changeset 224795 in webkit

Timestamp:

Nov 13, 2017, 4:55:41 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Windows] Fix Python error for subprocess.popen with close_fds
​https://bugs.webkit.org/show_bug.cgi?id=179553

Patch by Basuke Suzuki <Basuke Suzuki> on 2017-11-13
Reviewed by Per Arne Vollan.

• Scripts/webkitpy/port/server_process.py:

(ServerProcess._start):
(ServerProcess._should_close_fds):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-11-13  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [Windows] Fix Python error for subprocess.popen with close_fds
+        https://bugs.webkit.org/show_bug.cgi?id=179553
+
+        Reviewed by Per Arne Vollan.
+
+        * Scripts/webkitpy/port/server_process.py:
+        (ServerProcess._start):
+        (ServerProcess._should_close_fds):
+
 2017-11-13  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -111 +111 @@
             raise ValueError("%s already running" % self._name)
         self._reset()
-        # close_fds is a workaround for http://bugs.python.org/issue2320
-        # In Python 2.7.10, close_fds is also supported on Windows.
-        close_fds = True
         self._proc = self._target_host.executive.popen(self._cmd, stdin=self._target_host.executive.PIPE,
             stdout=self._target_host.executive.PIPE,
             stderr=self._target_host.executive.PIPE,
-            close_fds=close_fds,
+            close_fds=self._should_close_fds(),
             env=self._env,
             universal_newlines=self._universal_newlines)
@@ -124 +121 @@
             self._set_file_nonblocking(self._proc.stdout)
             self._set_file_nonblocking(self._proc.stderr)
+
+    def _should_close_fds(self):
+        # We need to pass close_fds=True to work around Python bug #2320
+        # (otherwise we can hang when we kill DumpRenderTree when we are running
+        # multiple threads). See http://bugs.python.org/issue2320 .
+        # In Python 2.7.10, close_fds is also supported on Windows.
+        # However, "you cannot set close_fds to true and also redirect the standard
+        # handles by setting stdin, stdout or stderr.".
+        platform = self._port.host.platform
+        if platform.is_win() and not platform.is_cygwin():
+            return False
+        else:
+            return True
 
     def _handle_possible_interrupt(self):