summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/process.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-06-17 10:31:49 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-06-17 10:31:49 (GMT)
commit0f83b1511c76e892b48b16d656cceb032bdb9cb3 (patch)
tree5ab5a54f9aa47924d9d8888abecbf2b851da1e1d /Lib/multiprocessing/process.py
parentb4cfa3ad6391d570d068a142052d6bc0f2602890 (diff)
downloadcpython-0f83b1511c76e892b48b16d656cceb032bdb9cb3.zip
cpython-0f83b1511c76e892b48b16d656cceb032bdb9cb3.tar.gz
cpython-0f83b1511c76e892b48b16d656cceb032bdb9cb3.tar.bz2
Issue #12310: finalize the old process after _run_after_forkers()
multiprocessing: Process._bootstrap() keeps a reference to the old process to delay its finalization until after _run_after_forkers() as been executed. This change should fix a crash on Mac OS X Tiger when a lock is released after a fork. Patch written by Charles-François Nataliv and Antoine Pitrou.
Diffstat (limited to 'Lib/multiprocessing/process.py')
-rw-r--r--Lib/multiprocessing/process.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index b56a061..941893f 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -251,9 +251,15 @@ class Process(object):
sys.stdin = open(os.devnull)
except (OSError, ValueError):
pass
+ old_process = _current_process
_current_process = self
- util._finalizer_registry.clear()
- util._run_after_forkers()
+ try:
+ util._finalizer_registry.clear()
+ util._run_after_forkers()
+ finally:
+ # delay finalization of the old process object until after
+ # _run_after_forkers() is executed
+ del old_process
util.info('child process calling self.run()')
try:
self.run()