(original) (raw)

changeset: 78296:4e85e4743757 branch: 2.7 parent: 78292:225bc86a0d75 user: Richard Oudkerk shibturn@gmail.com date: Fri Jul 27 14:05:46 2012 +0100 files: Lib/multiprocessing/connection.py Lib/test/test_multiprocessing.py Misc/ACKS Misc/NEWS description: Issue #6056: Make multiprocessing use setblocking(True) on the sockets it uses. Original patch by J Derek Wilson. diff -r 225bc86a0d75 -r 4e85e4743757 Lib/multiprocessing/connection.py --- a/Lib/multiprocessing/connection.py Fri Jul 27 10:52:18 2012 +0100 +++ b/Lib/multiprocessing/connection.py Fri Jul 27 14:05:46 2012 +0100 @@ -186,6 +186,8 @@ ''' if duplex: s1, s2 = socket.socketpair() + s1.setblocking(True) + s2.setblocking(True) c1 = _multiprocessing.Connection(os.dup(s1.fileno())) c2 = _multiprocessing.Connection(os.dup(s2.fileno())) s1.close() @@ -251,6 +253,7 @@ self._socket = socket.socket(getattr(socket, family)) try: self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self._socket.setblocking(True) self._socket.bind(address) self._socket.listen(backlog) self._address = self._socket.getsockname() @@ -269,6 +272,7 @@ def accept(self): s, self._last_accepted = self._socket.accept() + s.setblocking(True) fd = duplicate(s.fileno()) conn = _multiprocessing.Connection(fd) s.close() @@ -286,6 +290,7 @@ ''' family = address_type(address) s = socket.socket( getattr(socket, family) ) + s.setblocking(True) t = _init_timeout() while 1: diff -r 225bc86a0d75 -r 4e85e4743757 Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py Fri Jul 27 10:52:18 2012 +0100 +++ b/Lib/test/test_multiprocessing.py Fri Jul 27 14:05:46 2012 +0100 @@ -2315,8 +2315,42 @@ flike.flush() assert sio.getvalue() == 'foo' +# +# Test interaction with socket timeouts - see Issue #6056 +# + +class TestTimeouts(unittest.TestCase): + @classmethod + def _test_timeout(cls, child, address): + time.sleep(1) + child.send(123) + child.close() + conn = multiprocessing.connection.Client(address) + conn.send(456) + conn.close() + + def test_timeout(self): + old_timeout = socket.getdefaulttimeout() + try: + socket.setdefaulttimeout(0.1) + parent, child = multiprocessing.Pipe(duplex=True) + l = multiprocessing.connection.Listener(family='AF_INET') + p = multiprocessing.Process(target=self._test_timeout, + args=(child, l.address)) + p.start() + child.close() + self.assertEqual(parent.recv(), 123) + parent.close() + conn = l.accept() + self.assertEqual(conn.recv(), 456) + conn.close() + l.close() + p.join(10) + finally: + socket.setdefaulttimeout(old_timeout) + testcases_other = [OtherTest, TestInvalidHandle, TestInitializers, - TestStdinBadfiledescriptor] + TestStdinBadfiledescriptor, TestTimeouts] # # diff -r 225bc86a0d75 -r 4e85e4743757 Misc/ACKS --- a/Misc/ACKS Fri Jul 27 10:52:18 2012 +0100 +++ b/Misc/ACKS Fri Jul 27 14:05:46 2012 +0100 @@ -931,6 +931,7 @@ Gerald S. Williams Frank Willison Greg V. Wilson +J Derek Wilson Jody Winston Collin Winter Dik Winter diff -r 225bc86a0d75 -r 4e85e4743757 Misc/NEWS --- a/Misc/NEWS Fri Jul 27 10:52:18 2012 +0100 +++ b/Misc/NEWS Fri Jul 27 14:05:46 2012 +0100 @@ -129,6 +129,9 @@ - Issue #14653: email.utils.mktime_tz() no longer relies on system mktime() when timezone offest is supplied. +- Issue #6056: Make multiprocessing use setblocking(True) on the + sockets it uses. Original patch by J Derek Wilson. + - Issue #15101: Make pool finalizer avoid joining current thread. - Issue #15054: A bug in tokenize.tokenize that caused string literals /shibturn@gmail.com