diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-07-10 11:43:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 11:43:20 (GMT) |
| commit | 7f3d65d6e4f8bebaaf996efb1c1adb67eb1724cb (patch) | |
| tree | a5c377c0402f924fc328efbc0128b0cfa852352f /Lib | |
| parent | 7ab334233394070a25344d481c8de1402fa12b29 (diff) | |
| download | cpython-7f3d65d6e4f8bebaaf996efb1c1adb67eb1724cb.zip cpython-7f3d65d6e4f8bebaaf996efb1c1adb67eb1724cb.tar.gz cpython-7f3d65d6e4f8bebaaf996efb1c1adb67eb1724cb.tar.bz2 | |
bpo-30886: Fix multiprocessing.Queue.join_thread() (#2642) (#2643)
multiprocessing.Queue.join_thread() now waits until the thread
completes, even if the thread was started by the same process which
created the queue.
Fix the following warning which occurs randomly when running
test_handle_called_with_mp_queue of test_logging.QueueListenerTest:
Warning -- threading_cleanup() failed to cleanup -1 threads after 4 sec (count: 0, dangling: 1)
(cherry picked from commit 3b69d911c57ef591ac0c0f47a66dbcad8337f33a)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/multiprocessing/queues.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py index 7f77837..7668417 100644 --- a/Lib/multiprocessing/queues.py +++ b/Lib/multiprocessing/queues.py @@ -169,14 +169,7 @@ class Queue(object): self._thread.start() debug('... done self._thread.start()') - # On process exit we will wait for data to be flushed to pipe. - # - # However, if this process created the queue then all - # processes which use the queue will be descendants of this - # process. Therefore waiting for the queue to be flushed - # is pointless once all the child processes have been joined. - created_by_this_process = (self._opid == os.getpid()) - if not self._joincancelled and not created_by_this_process: + if not self._joincancelled: self._jointhread = Finalize( self._thread, Queue._finalize_join, [weakref.ref(self._thread)], |