Skip to content

gh-87135: Hang non-main threads that attempt to acquire the GIL during finalization #28525

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
jbms wants to merge 11 commits into from
Closed

gh-87135: Hang non-main threads that attempt to acquire the GIL during finalization #28525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbc2e33
bpo-42969: Hang non-main threads that attempt to acquire the GIL duri…
jbms Sep 22, 2021
0cb5f8f
Merge branch 'main' into fix-issue-42969
gpshead Sep 20, 2022
703d799
Correct news blurb filename, revert Doc/tools edit
gpshead Sep 20, 2022
40222ec
Apply suggestions from code review
jbms Sep 21, 2022
ea5cc54
Revise race condition test cases to use threading.Event in addition t…
jbms Sep 21, 2022
e71b959
Merge remote-tracking branch 'origin/main' into fix-issue-42969
jbms May 2, 2023
2b51995
Revert back to using pause rather than sigsuspend
jbms May 2, 2023
8022ebe
Py_FatalError instead of assert(0) in _testcapimodule
gpshead May 25, 2023
334777e
Merge branch 'main' into fix-issue-42969
gpshead May 25, 2023
6f85036
Port this branch to per-interpreter-GIL.
gpshead May 26, 2023
bdebcf8
Update Doc/c-api/init.rst
jbms Jun 2, 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
Merge branch 'main' into fix-issue-42969
  • Loading branch information
@gpshead
gpshead authored May 25, 2023
commit 334777e120b878811c954f72e68d1e16ecc5a2f1
8 changes: 8 additions & 0 deletions Misc/stable_abi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,6 +2397,14 @@
added = '3.12' # Before 3.12, available in "structmember.h" w/o Py_ prefix
[const.Py_AUDIT_READ]
added = '3.12' # Before 3.12, available in "structmember.h"
[function.PyObject_GetTypeData]
added = '3.12'
[function.PyType_GetTypeDataSize]
added = '3.12'
[const.Py_RELATIVE_OFFSET]
added = '3.12'
[const.Py_TPFLAGS_ITEMS_AT_END]
added = '3.12'
[function.PyGILState_ReleaseGILAndFinalizeBlock]
added = '3.12'
[function.PyGILState_TryAcquireFinalizeBlockAndGIL]
Expand Down
2 changes: 1 addition & 1 deletion Python/ceval_gil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ take_gil(PyThreadState *tstate)
in take_gil() while the main thread called
wait_for_thread_shutdown() from Py_Finalize(). */
MUTEX_UNLOCK(gil->mutex);
drop_gil(ceval, ceval2, tstate);
drop_gil(ceval, tstate);
_PyThread_hang_thread();
}
assert(is_tstate_valid(tstate));
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.