Merged revisions 78524 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78524 | gregory.p.smith | 2010-02-28 16:17:40 -0800 (Sun, 28 Feb 2010) | 10 lines

  Merged revisions 78523 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78523 | gregory.p.smith | 2010-02-28 16:05:08 -0800 (Sun, 28 Feb 2010) | 3 lines

    Issue #1068268: The subprocess module now handles EINTR in internal
    os.waitpid and os.read system calls where appropriate.
  ........
................

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 30cbfcb684f3654884f39b057681d0ad45ab1610..fa54bcaa660bb200098b087de5788899ec7bfab6 100644 (file)
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -407,6 +407,16 @@ PIPE = -1
 STDOUT = -2
 
 
+def _eintr_retry_call(func, *args):
+    while True:
+        try:
+            return func(*args)
+        except OSError as e:
+            if e.errno == errno.EINTR:
+                continue
+            raise
+
+
 def call(*popenargs, **kwargs):
     """Run command with arguments.  Wait for command to complete, then
     return the returncode attribute.
@@ -1134,13 +1144,13 @@ class Popen(object):
 
                 # Wait for exec to fail or succeed; possibly raising an
                 # exception (limited to 1 MB)
-                data = os.read(errpipe_read, 1048576)
+                data = _eintr_retry_call(os.read, errpipe_read, 1048576)
             finally:
                 # be sure the FD is closed no matter what
                 os.close(errpipe_read)
 
             if data:
-                os.waitpid(self.pid, 0)
+                _eintr_retry_call(os.waitpid, self.pid, 0)
                 child_exception = pickle.loads(data)
                 for fd in (p2cwrite, c2pread, errread):
                     if fd is not None:
@@ -1176,7 +1186,7 @@ class Popen(object):
             """Wait for child process to terminate.  Returns returncode
             attribute."""
             if self.returncode is None:
-                pid, sts = os.waitpid(self.pid, 0)
+                pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0)
                 self._handle_exitstatus(sts)
             return self.returncode
 

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 265859a21d9065ee2489f09df7109b879c87f531..4db8033ac795961cf3cc1abeda9137dc13f746ac 100644 (file)
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -4,6 +4,7 @@ import subprocess
 import sys
 import signal
 import os
+import errno
 import tempfile
 import time
 import re
@@ -814,6 +815,25 @@ if getattr(subprocess, '_has_poll', False):
     unit_tests.append(ProcessTestCaseNoPoll)
 
 
+class HelperFunctionTests(unittest.TestCase):
+    def test_eintr_retry_call(self):
+        record_calls = []
+        def fake_os_func(*args):
+            record_calls.append(args)
+            if len(record_calls) == 2:
+                raise OSError(errno.EINTR, "fake interrupted system call")
+            return tuple(reversed(args))
+
+        self.assertEqual((999, 256),
+                         subprocess._eintr_retry_call(fake_os_func, 256, 999))
+        self.assertEqual([(256, 999)], record_calls)
+        # This time there will be an EINTR so it will loop once.
+        self.assertEqual((666,),
+                         subprocess._eintr_retry_call(fake_os_func, 666))
+        self.assertEqual([(256, 999), (666,), (666,)], record_calls)
+
+unit_tests.append(HelperFunctionTests)
+
 def test_main():
     support.run_unittest(*unit_tests)
     support.reap_children()

diff --git a/Misc/NEWS b/Misc/NEWS
index 60603c0060688b39b168ef8e2c1cc5dbbb9d343d..e30945a14db3f7e36a61b0500f84c2676b93d8e3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -335,6 +335,9 @@ Library
 - Issue #7481: When a threading.Thread failed to start it would leave the
   instance stuck in initial state and present in threading.enumerate().
 
+- Issue #1068268: The subprocess module now handles EINTR in internal
+  os.waitpid and os.read system calls where appropriate.
+
 Extension Modules
 -----------------