traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Zachary Ware 2014-10-03 10:56:22 -05:00
parent b55f944fa9 7280561b5b
commit 4d2aba3ab3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/multiprocessing.rst
View File

@ -842,7 +842,7 @@ Miscellaneous
Return list of all live children of the current process.
Calling this has the side affect of "joining" any processes which have
Calling this has the side effect of "joining" any processes which have
already finished.
.. function:: cpu_count()
@ -2467,7 +2467,7 @@ Joining processes that use queues
items which have been put on the queue will eventually be removed before the
process is joined. Otherwise you cannot be sure that processes which have
put items on the queue will terminate. Remember also that non-daemonic
processes will be automatically be joined.
processes will be joined automatically.
An example which will deadlock is the following::
@ -2483,7 +2483,7 @@ Joining processes that use queues
p.join() # this deadlocks
obj = queue.get()
A fix here would be to swap the last two lines round (or simply remove the
A fix here would be to swap the last two lines (or simply remove the
``p.join()`` line).
Explicitly pass resources to child processes