Skip to content

gh-104341: Fix threading Module Shutdown #104560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ericsnowcurrently wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

gh-104341: Fix threading Module Shutdown #104560

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e5804c1
Add module-owned threads to module state.
ericsnowcurrently May 15, 2023
62df3e6
Re-initialize the module threads lock upon fork.
ericsnowcurrently May 15, 2023
1bf707f
Add module_thread.daemonic.
ericsnowcurrently May 16, 2023
da78235
Add module_thread.lifetime_mutex.
ericsnowcurrently May 16, 2023
ad9bbce
Add _thread._wait_for_threads_fini().
ericsnowcurrently May 16, 2023
54dc3b5
Wait for all the threads to finalize.
ericsnowcurrently May 16, 2023
b15fa9d
Fix Windows.
ericsnowcurrently May 16, 2023
c7a832b
Fix Windows.
ericsnowcurrently May 16, 2023
51d960e
Fix Windows.
ericsnowcurrently May 16, 2023
bddfc46
Wait for all threads that aren't killed daemon threads to finalize.
ericsnowcurrently May 16, 2023
188d141
Fix a typo.
ericsnowcurrently May 16, 2023
bd3accd
Silence some warnings.
ericsnowcurrently May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Windows.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 16, 2023
commit c7a832bb5b24ba4203647cdb436268754553bc2d
6 changes: 3 additions & 3 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,6 @@ PyDoc_STRVAR(excepthook_doc,
\n\
Handle uncaught Thread.run() exception.");

#ifdef HAVE_FORK
static PyObject *
thread__wait_for_threads_fini(PyObject *module, PyObject *Py_UNUSED(ignored))
{
Expand All @@ -1828,6 +1827,7 @@ thread__wait_for_threads_fini(PyObject *module, PyObject *Py_UNUSED(ignored))
Py_RETURN_NONE;
}

#ifdef HAVE_FORK
static PyObject *
thread__after_fork(PyObject *module, PyObject *Py_UNUSED(ignored))
{
Expand Down Expand Up @@ -1870,10 +1870,10 @@ static PyMethodDef thread_methods[] = {
METH_NOARGS, _set_sentinel_doc},
{"_excepthook", thread_excepthook,
METH_O, excepthook_doc},
{"_wait_for_threads_fini", (PyCFunction)thread__wait_for_threads_fini,
{"_wait_for_threads_fini", thread__wait_for_threads_fini,
METH_NOARGS, NULL},
#ifdef HAVE_FORK
{"_after_fork", (PyCFunction)thread__after_fork,
{"_after_fork", thread__after_fork,
METH_NOARGS, NULL},
#endif
{NULL, NULL} /* sentinel */
Expand Down