diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-06-18 14:54:57 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-06-18 14:54:57 (GMT) |
| commit | f29ec4b0c89bbb3a4ee4549b3b4a8535d040833f (patch) | |
| tree | e2efb6db5faad4bcefdcadccdff75565d6e4db55 /Lib/multiprocessing | |
| parent | da7a6e7da09f980f92559735079dc3f35cbe1ded (diff) | |
| download | cpython-f29ec4b0c89bbb3a4ee4549b3b4a8535d040833f.zip cpython-f29ec4b0c89bbb3a4ee4549b3b4a8535d040833f.tar.gz cpython-f29ec4b0c89bbb3a4ee4549b3b4a8535d040833f.tar.bz2 | |
Issue #15101: Make pool finalizer avoid joining current thread.
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/pool.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index ccee961..7502ff8 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -493,7 +493,8 @@ class Pool(object): # We must wait for the worker handler to exit before terminating # workers because we don't want workers to be restarted behind our back. debug('joining worker handler') - worker_handler.join() + if threading.current_thread() is not worker_handler: + worker_handler.join() # Terminate workers which haven't already finished. if pool and hasattr(pool[0], 'terminate'): @@ -503,10 +504,12 @@ class Pool(object): p.terminate() debug('joining task handler') - task_handler.join() + if threading.current_thread() is not task_handler: + task_handler.join() debug('joining result handler') - result_handler.join() + if threading.current_thread() is not result_handler: + result_handler.join() if pool and hasattr(pool[0], 'terminate'): debug('joining pool workers') |