Issue #6056: Make multiprocessing use setblocking(True) on the sockets it uses.

Original patch by J Derek Wilson.
This commit is contained in:
Richard Oudkerk 2012-07-27 14:06:11 +01:00
parent a58d668fd9
commit 4887b1c0e7
4 changed files with 44 additions and 1 deletions

View file

@ -199,6 +199,8 @@ if sys.platform != 'win32':
'''
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()
@ -264,6 +266,7 @@ class SocketListener(object):
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()
@ -282,6 +285,7 @@ class SocketListener(object):
def accept(self):
s, self._last_accepted = self._socket.accept()
s.setblocking(True)
fd = duplicate(s.fileno())
conn = _multiprocessing.Connection(fd)
s.close()
@ -299,6 +303,7 @@ def SocketClient(address):
'''
family = address_type(address)
with socket.socket( getattr(socket, family) ) as s:
s.setblocking(True)
t = _init_timeout()
while 1: