]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
gh-118727: Don't drop the GIL in `drop_gil()` unless the current thread holds it...
authorBrett Simmers <swtaarrs@users.noreply.github.com>
Thu, 23 May 2024 20:59:35 +0000 (16:59 -0400)
committerGitHub <noreply@github.com>
Thu, 23 May 2024 20:59:35 +0000 (16:59 -0400)
commitbe1dfccdf2c5c7671b8a549e969b8cf7d60d9936
tree920d35829b0fb8d51399ff69760998165da704cb
parentb30d30c747df2bf9f1614df8e76db2ffdb24fcd8
gh-118727: Don't drop the GIL in `drop_gil()` unless the current thread holds it (#118745)

`drop_gil()` assumes that its caller is attached, which means that the current
thread holds the GIL if and only if the GIL is enabled, and the enabled-state
of the GIL won't change. This isn't true, though, because `detach_thread()`
calls `_PyEval_ReleaseLock()` after detaching and
`_PyThreadState_DeleteCurrent()` calls it after removing the current thread
from consideration for stop-the-world requests (effectively detaching it).

Fix this by remembering whether or not a thread acquired the GIL when it last
attached, in `PyThreadState._status.holds_gil`, and check this in `drop_gil()`
instead of `gil->enabled`.

This fixes a crash in `test_multiprocessing_pool_circular_import()`, so I've
reenabled it.
Include/cpython/pystate.h
Include/internal/pycore_ceval.h
Lib/test/test_importlib/test_threaded_import.py
Python/ceval_gil.c
Python/pystate.c