Skip to content

gh-99113: Make Sure the GIL is Acquired at the Right Places #104208

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
ericsnowcurrently merged 7 commits into from
May 6, 2023
Merged

gh-99113: Make Sure the GIL is Acquired at the Right Places #104208

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca1f78e
Add _PyEval_AcquireLock().
ericsnowcurrently Apr 10, 2023
c5d3b2c
Add _PyThreadState_SwapNoGIL().
ericsnowcurrently Apr 10, 2023
2404310
Acquire the GIL when not owned.
ericsnowcurrently Apr 10, 2023
85702ae
Fix a typo.
ericsnowcurrently May 6, 2023
3cc9dc3
Do not release the GIL when not necessary.
ericsnowcurrently May 6, 2023
3104796
Make sure the GIL is held by the current thread in _PyEval_InitGIL().
ericsnowcurrently May 6, 2023
56064c7
Release the GIL after swapping thread states.
ericsnowcurrently May 6, 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
Make sure the GIL is held by the current thread in _PyEval_InitGIL().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 6, 2023
commit 3104796f16f3a6e25340fa9247e532d8863ff283
16 changes: 13 additions & 3 deletions Python/ceval_gil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,15 @@ PyEval_ThreadsInitialized(void)
return _PyEval_ThreadsInitialized();
}

static inline int
current_thread_holds_gil(struct _gil_runtime_state *gil, PyThreadState *tstate)
{
if (((PyThreadState*)_Py_atomic_load_relaxed(&gil->last_holder)) != tstate) {
return 0;
}
return _Py_atomic_load_relaxed(&gil->locked);
}

static void
init_shared_gil(PyInterpreterState *interp, struct _gil_runtime_state *gil)
{
Expand All @@ -525,8 +534,9 @@ _PyEval_InitGIL(PyThreadState *tstate, int own_gil)
if (!own_gil) {
PyInterpreterState *main_interp = _PyInterpreterState_Main();
assert(tstate->interp != main_interp);
init_shared_gil(tstate->interp, main_interp->ceval.gil);
locked = _Py_atomic_load_relaxed(&main_interp->ceval.gil->locked);
struct _gil_runtime_state *gil = main_interp->ceval.gil;
init_shared_gil(tstate->interp, gil);
locked = current_thread_holds_gil(gil, tstate);
}
/* XXX per-interpreter GIL */
else if (!_Py_IsMainInterpreter(tstate->interp)) {
Expand All @@ -537,7 +547,7 @@ _PyEval_InitGIL(PyThreadState *tstate, int own_gil)
init_shared_gil(tstate->interp, main_gil);
// XXX For now we lie.
tstate->interp->ceval.own_gil = 1;
Comment thread
erlend-aasland marked this conversation as resolved.
locked = _Py_atomic_load_relaxed(&main_gil->locked);
locked = current_thread_holds_gil(main_gil, tstate);
}
else {
PyThread_init_thread();
Expand Down