diff options
| author | Victor Stinner <vstinner@python.org> | 2020-04-13 09:45:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 09:45:21 (GMT) |
| commit | 1c4cbdf94dbb4a6ac1093d2fa7a75efa802b25bc (patch) | |
| tree | e83ac1dbc56e942701d0ac73ce722a90ddedfa22 /Python | |
| parent | 0135598d729d01f35ce08d47160adaa095a6149f (diff) | |
| download | cpython-1c4cbdf94dbb4a6ac1093d2fa7a75efa802b25bc.zip cpython-1c4cbdf94dbb4a6ac1093d2fa7a75efa802b25bc.tar.gz cpython-1c4cbdf94dbb4a6ac1093d2fa7a75efa802b25bc.tar.bz2 | |
bpo-40268: Add pycore_runtime.h header file (GH-19493)
Move PyRuntimeState from pycore_pystate.h to pycore_runtime.h.
Remove _PyGILState_check_enabled macro: access directly
_PyRuntime.gilstate.check_enabled.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pylifecycle.c | 2 | ||||
| -rw-r--r-- | Python/pystate.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 1bc7d77..c2a0781 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1553,7 +1553,7 @@ new_interpreter(PyThreadState **tstate_p) /* Issue #10915, #15751: The GIL API doesn't work with multiple interpreters: disable PyGILState_Check(). */ - _PyGILState_check_enabled = 0; + runtime->gilstate.check_enabled = 0; PyInterpreterState *interp = PyInterpreterState_New(); if (interp == NULL) { diff --git a/Python/pystate.c b/Python/pystate.c index 19beaf0..3636dc9 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1329,12 +1329,11 @@ PyGILState_GetThisThreadState(void) int PyGILState_Check(void) { - - if (!_PyGILState_check_enabled) { + struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate; + if (!gilstate->check_enabled) { return 1; } - struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate; if (!PyThread_tss_is_created(&gilstate->autoTSSkey)) { return 1; } |