bpo-16500: Use register_at_fork() in the threading module (#1843)

* bpo-16500: Use register_at_fork() in the threading module

* Update comment at top of _after_fork()
This commit is contained in:
Antoine Pitrou 2017-05-28 14:02:26 +02:00 committed by GitHub
parent 0aa0a06e8b
commit 4a8bcdf79c
2 changed files with 9 additions and 22 deletions

View file

@ -1,5 +1,6 @@
"""Thread module emulating a subset of Java's threading model."""
import os as _os
import sys as _sys
import _thread
@ -943,6 +944,7 @@ class Thread:
exc_tb.tb_frame.f_code.co_name)), file=self._stderr)
exc_tb = exc_tb.tb_next
print(("%s: %s" % (exc_type, exc_value)), file=self._stderr)
self._stderr.flush()
# Make sure that exc_tb gets deleted since it is a memory
# hog; deleting everything else is just for thoroughness
finally:
@ -1319,10 +1321,9 @@ except ImportError:
def _after_fork():
# This function is called by Python/ceval.c:PyEval_ReInitThreads which
# is called from PyOS_AfterFork_Child. Here we cleanup threading module
# state that should not exist after a fork.
"""
Cleanup threading module state that should not exist after a fork.
"""
# Reset _active_limbo_lock, in case we forked while the lock was held
# by another (non-forked) thread. http://bugs.python.org/issue874900
global _active_limbo_lock, _main_thread
@ -1356,3 +1357,7 @@ def _after_fork():
_active.clear()
_active.update(new_active)
assert len(_active) == 1
if hasattr(_os, "fork"):
_os.register_at_fork(_after_fork, when="child")