Skip to content

gh-99113: A Per-Interpreter GIL! #104209

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 17 commits into from
Closed

gh-99113: A Per-Interpreter GIL! #104209

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2aad06a
Add a comment.
ericsnowcurrently Sep 12, 2022
e55fbdd
_gil_runtime_state -> _gil_state.
ericsnowcurrently Sep 12, 2022
711b19d
Pass PyInterpreterState to _PyEval_ThreadInitialized().
ericsnowcurrently Sep 12, 2022
dba4460
runtime->main -> runtime->interpreters.main.
ericsnowcurrently Sep 12, 2022
5342672
Pass PyInterpreterState to _PyEval_InitState().
ericsnowcurrently Sep 12, 2022
f2361d7
Label some struct fields.
ericsnowcurrently Sep 12, 2022
adc09a0
Add _get_gil().
ericsnowcurrently Sep 12, 2022
7014bff
Pass the runtime to _PyEval_InitRuntimeState().
ericsnowcurrently Sep 12, 2022
2026034
Add some comments.
ericsnowcurrently Sep 12, 2022
3ce9695
Add _GET_OWN_GIL().
ericsnowcurrently Sep 12, 2022
57ca2fa
Pass PyInterpreterState to _PyEval_FiniState().
ericsnowcurrently Sep 12, 2022
936c86d
Call _gil_initialize() in _PyEval_InitState().
ericsnowcurrently Sep 12, 2022
66ca3e4
Drop _PyEval_InitRuntimeState().
ericsnowcurrently Sep 12, 2022
6d09320
Move the GIL to PyInterpreterState (but still share).
ericsnowcurrently Sep 12, 2022
5075992
Keep sharing the GIL.
ericsnowcurrently Sep 12, 2022
f39c883
Check for GIL ownership.
ericsnowcurrently Sep 12, 2022
ae2eb3c
Stop sharing the GIL if configured as "isolated".
ericsnowcurrently Sep 12, 2022
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
Add _GET_OWN_GIL().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 12, 2022
commit 3ce9695374dd2dce25ab66121c4460016cd3db3e
26 changes: 14 additions & 12 deletions Python/ceval_gil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ is_tstate_valid(PyThreadState *tstate)
} \


/* Currently, the GIL is shared by all interpreters,
and only the main interpreter is responsible to create
and destroy it. */
#define _GET_OWN_GIL(interp) \
(_Py_IsMainInterpreter(interp) ? (&_PyRuntime.ceval.gil) : NULL)

static inline struct _gil_state *
_get_gil(PyInterpreterState *interp)
{
Expand Down Expand Up @@ -493,14 +499,12 @@ PyEval_ThreadsInitialized(void)
PyStatus
_PyEval_InitGIL(PyThreadState *tstate)
{
if (!_Py_IsMainInterpreter(tstate->interp)) {
/* Currently, the GIL is shared by all interpreters,
and only the main interpreter is responsible to create
and destroy it. */
struct _gil_state *gil = _get_gil(tstate->interp);
if (gil != _GET_OWN_GIL(tstate->interp)) {
/* It's a shared GIL. */
assert(!_Py_IsMainInterpreter(tstate->interp));
return _PyStatus_OK();
}

struct _gil_state *gil = _get_gil(tstate->interp);
assert(!gil_created(gil));

PyThread_init_thread();
Expand All @@ -515,14 +519,12 @@ _PyEval_InitGIL(PyThreadState *tstate)
void
_PyEval_FiniGIL(PyInterpreterState *interp)
{
if (!_Py_IsMainInterpreter(interp)) {
/* Currently, the GIL is shared by all interpreters,
and only the main interpreter is responsible to create
and destroy it. */
struct _gil_state *gil = _get_gil(interp);
if (gil != _GET_OWN_GIL(interp)) {
/* It's a shared GIL. */
assert(!_Py_IsMainInterpreter(interp));
return;
}

struct _gil_state *gil = _get_gil(interp);
if (!gil_created(gil)) {
/* First Py_InitializeFromConfig() call: the GIL doesn't exist
yet: do nothing. */
Expand Down