summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-13 22:31:18 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-13 22:31:18 (GMT)
commitc562ca4625992836919b5f787bd9cb288226dae7 (patch)
treecfed14a0cb6b9b4ca62d6ec7ca3ff6c6a6bf0ec9 /Lib/multiprocessing
parentc4a346cc550328512da8448d51061e964a60e741 (diff)
downloadcpython-c562ca4625992836919b5f787bd9cb288226dae7.zip
cpython-c562ca4625992836919b5f787bd9cb288226dae7.tar.gz
cpython-c562ca4625992836919b5f787bd9cb288226dae7.tar.bz2
Issue #7318: multiprocessing now uses a timeout when it fails to establish
a connection with another process, rather than looping endlessly. The default timeout is 20 seconds, which should be amply sufficient for local connections.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/connection.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 59beaa0..b1f5acd 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -27,6 +27,8 @@ from multiprocessing.forking import duplicate, close
#
BUFSIZE = 8192
+# A very generous timeout when it comes to local connections...
+CONNECTION_TIMEOUT = 20.
_mmap_counter = itertools.count()
@@ -41,6 +43,13 @@ if sys.platform == 'win32':
default_family = 'AF_PIPE'
families += ['AF_PIPE']
+
+def _init_timeout(timeout=CONNECTION_TIMEOUT):
+ return time.time() + timeout
+
+def _check_timeout(t):
+ return time.time() > t
+
#
#
#
@@ -247,12 +256,13 @@ def SocketClient(address):
'''
family = address_type(address)
s = socket.socket( getattr(socket, family) )
+ t = _init_timeout()
while 1:
try:
s.connect(address)
except socket.error, e:
- if e.args[0] != errno.ECONNREFUSED: # connection refused
+ if e.args[0] != errno.ECONNREFUSED or _check_timeout(t):
debug('failed to connect to address %s', address)
raise
time.sleep(0.01)
@@ -322,6 +332,7 @@ if sys.platform == 'win32':
'''
Return a connection object connected to the pipe given by `address`
'''
+ t = _init_timeout()
while 1:
try:
win32.WaitNamedPipe(address, 1000)
@@ -331,7 +342,7 @@ if sys.platform == 'win32':
)
except WindowsError, e:
if e.args[0] not in (win32.ERROR_SEM_TIMEOUT,
- win32.ERROR_PIPE_BUSY):
+ win32.ERROR_PIPE_BUSY) or _check_timeout(t):
raise
else:
break