diff options
| author | Hugo van Kemenade <hugovk@users.noreply.github.com> | 2023-11-20 13:52:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-20 13:52:00 (GMT) |
| commit | 3b3ec0d77f0f836cbe5ff1ab97efcc8b7ed5d787 (patch) | |
| tree | f79786b7e97064b1a71840ac9c1421e87d6adc15 /Python | |
| parent | 1c8f912ebdfdb146cd7dd2d7a3a67d2c5045ddb0 (diff) | |
| download | cpython-3b3ec0d77f0f836cbe5ff1ab97efcc8b7ed5d787.zip cpython-3b3ec0d77f0f836cbe5ff1ab97efcc8b7ed5d787.tar.gz cpython-3b3ec0d77f0f836cbe5ff1ab97efcc8b7ed5d787.tar.bz2 | |
gh-111863: Rename `Py_NOGIL` to `Py_GIL_DISABLED` (#111864)
Rename Py_NOGIL to Py_GIL_DISABLED
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 4 | ||||
| -rw-r--r-- | Python/lock.c | 2 | ||||
| -rw-r--r-- | Python/pystate.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index ae51578..ba234dc 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -46,13 +46,13 @@ # error "ceval.c must be build with Py_BUILD_CORE define for best performance" #endif -#if !defined(Py_DEBUG) && !defined(Py_TRACE_REFS) && !defined(Py_NOGIL) +#if !defined(Py_DEBUG) && !defined(Py_TRACE_REFS) && !defined(Py_GIL_DISABLED) // GH-89279: The MSVC compiler does not inline these static inline functions // in PGO build in _PyEval_EvalFrameDefault(), because this function is over // the limit of PGO, and that limit cannot be configured. // Define them as macros to make sure that they are always inlined by the // preprocessor. -// TODO: implement Py_DECREF macro for Py_NOGIL +// TODO: implement Py_DECREF macro for Py_GIL_DISABLED #undef Py_DECREF #define Py_DECREF(arg) \ diff --git a/Python/lock.c b/Python/lock.c index bc43b1a..e9279f0 100644 --- a/Python/lock.c +++ b/Python/lock.c @@ -21,7 +21,7 @@ static const _PyTime_t TIME_TO_BE_FAIR_NS = 1000*1000; // Spin for a bit before parking the thread. This is only enabled for // `--disable-gil` builds because it is unlikely to be helpful if the GIL is // enabled. -#if Py_NOGIL +#if Py_GIL_DISABLED static const int MAX_SPIN_COUNT = 40; #else static const int MAX_SPIN_COUNT = 0; diff --git a/Python/pystate.c b/Python/pystate.c index 89e9bdd..6196b15 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1857,7 +1857,7 @@ tstate_deactivate(PyThreadState *tstate) static int tstate_try_attach(PyThreadState *tstate) { -#ifdef Py_NOGIL +#ifdef Py_GIL_DISABLED int expected = _Py_THREAD_DETACHED; if (_Py_atomic_compare_exchange_int( &tstate->state, @@ -1877,7 +1877,7 @@ static void tstate_set_detached(PyThreadState *tstate) { assert(tstate->state == _Py_THREAD_ATTACHED); -#ifdef Py_NOGIL +#ifdef Py_GIL_DISABLED _Py_atomic_store_int(&tstate->state, _Py_THREAD_DETACHED); #else tstate->state = _Py_THREAD_DETACHED; |