Skip to content

gh-135099: Only wait on _PyOS_SigintEvent() in main thread #135100

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

Merged
merged 2 commits into from
Jun 4, 2025
Merged

gh-135099: Only wait on _PyOS_SigintEvent() in main thread #135100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ccd43c
gh-135099: Only wait on `_PyOS_SigintEvent()` in main thread
colesbury Jun 3, 2025
7c7d96e
Use _Py_IsMainThread() instead
colesbury Jun 3, 2025
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2025-06-03-18-26-54.gh-issue-135099.Q9usKm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash that could occur on Windows when a background thread waits on a
:c:type:`PyMutex` while the main thread is shutting down the interpreter.
22 changes: 16 additions & 6 deletions Python/parking_lot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,27 @@ _PySemaphore_PlatformWait(_PySemaphore *sema, PyTime_t timeout)
}
}

// NOTE: we wait on the sigint event even in non-main threads to match the
// behavior of the other platforms. Non-main threads will ignore the
// Py_PARK_INTR result.
HANDLE sigint_event = _PyOS_SigintEvent();
HANDLE handles[2] = { sema->platform_sem, sigint_event };
DWORD count = sigint_event != NULL ? 2 : 1;
HANDLE handles[2] = { sema->platform_sem, NULL };
HANDLE sigint_event = NULL;
DWORD count = 1;
if (_Py_IsMainThread()) {
// gh-135099: Wait on the SIGINT event only in the main thread. Other
// threads would ignore the result anyways, and accessing
// `_PyOS_SigintEvent()` from non-main threads may race with
// interpreter shutdown, which closes the event handle. Note that
// non-main interpreters will ignore the result.
sigint_event = _PyOS_SigintEvent();
if (sigint_event != NULL) {
handles[1] = sigint_event;
count = 2;
}
}
wait = WaitForMultipleObjects(count, handles, FALSE, millis);
if (wait == WAIT_OBJECT_0) {
res = Py_PARK_OK;
}
else if (wait == WAIT_OBJECT_0 + 1) {
assert(sigint_event != NULL);
ResetEvent(sigint_event);
res = Py_PARK_INTR;
}
Expand Down
Loading