summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-02-02 16:15:50 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-02-02 16:15:50 (GMT)
commiteff492f4b70a1754adc871a536edae9d69640874 (patch)
tree66d3569d8d75436da7a34b141d1485a9c59aea4c /Lib/multiprocessing
parent99b0b72619ec8f13ac8e6568eafe8d542b871b65 (diff)
downloadcpython-eff492f4b70a1754adc871a536edae9d69640874.zip
cpython-eff492f4b70a1754adc871a536edae9d69640874.tar.gz
cpython-eff492f4b70a1754adc871a536edae9d69640874.tar.bz2
Issue #15881: Fixed atexit hook in multiprocessing.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/util.py41
1 files changed, 32 insertions, 9 deletions
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index c65dd99..fe76bcc 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -247,6 +247,12 @@ def _run_finalizers(minpriority=None):
Finalizers with highest priority are called first; finalizers with
the same priority will be called in reverse order of creation.
'''
+ if _finalizer_registry is None:
+ # This function may be called after this module's globals are
+ # destroyed. See the _exit_function function in this module for more
+ # notes.
+ return
+
if minpriority is None:
f = lambda p : p[0][0] is not None
else:
@@ -278,21 +284,38 @@ def is_exiting():
_exiting = False
-def _exit_function():
+def _exit_function(info=info, debug=debug, _run_finalizers=_run_finalizers,
+ active_children=active_children,
+ current_process=current_process):
+ # NB: we hold on to references to functions in the arglist due to the
+ # situation described below, where this function is called after this
+ # module's globals are destroyed.
+
global _exiting
info('process shutting down')
debug('running all "atexit" finalizers with priority >= 0')
_run_finalizers(0)
- for p in active_children():
- if p._daemonic:
- info('calling terminate() for daemon %s', p.name)
- p._popen.terminate()
-
- for p in active_children():
- info('calling join() for process %s', p.name)
- p.join()
+ if current_process() is not None:
+ # NB: we check if the current process is None here because if
+ # it's None, any call to ``active_children()`` will throw an
+ # AttributeError (active_children winds up trying to get
+ # attributes from util._current_process). This happens in a
+ # variety of shutdown circumstances that are not well-understood
+ # because module-scope variables are not apparently supposed to
+ # be destroyed until after this function is called. However,
+ # they are indeed destroyed before this function is called. See
+ # issues 9775 and 15881. Also related: 4106, 9205, and 9207.
+
+ for p in active_children():
+ if p._daemonic:
+ info('calling terminate() for daemon %s', p.name)
+ p._popen.terminate()
+
+ for p in active_children():
+ info('calling join() for process %s', p.name)
+ p.join()
debug('running the remaining "atexit" finalizers')
_run_finalizers()