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

Closed
ericsnowcurrently wants to merge 12 commits into from
Closed

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
Wait for all the threads to finalize.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 16, 2023
commit 54dc3b5f299208d886edb2dfaff23aaea449203f
9 changes: 9 additions & 0 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,15 @@ module_threads_reinit(struct module_threads *threads)
static void
module_threads_fini(struct module_threads *threads)
{
// Wait for all the threads to finalize.
PyThread_acquire_lock(threads->mutex, WAIT_LOCK);
while (threads->head != NULL) {
PyThread_release_lock(threads->mutex);
// XXX Sleep?
PyThread_acquire_lock(threads->mutex, WAIT_LOCK);
}
PyThread_release_lock(threads->mutex);

@ericsnowcurrently ericsnowcurrently May 16, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this doesn't feel right. I'm going to look at what my options are. A condvar would work, but that doesn't seem to be something we do in CPython outside the GIL.

(I'm also open to ideas.)

@ericsnowcurrently ericsnowcurrently May 16, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've come up with a slightly better approach.


PyThread_free_lock(threads->mutex);
}

Expand Down