diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2019-04-12 16:20:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 16:20:10 (GMT) |
| commit | b75b1a3504a0cea6fac6ecba44c10b2629577025 (patch) | |
| tree | 14d6fd9909a1f4ec1ca70ba012569bd495d35d5a /Python/ceval_gil.h | |
| parent | f938d8be4ce3e1ccca7c31cf673265634307147f (diff) | |
| download | cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.zip cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.tar.gz cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.tar.bz2 | |
bpo-33608: Revert "Factor out a private, per-interpreter _Py_AddPendingCall()." (gh-12806)
This reverts commit f13c5c8b9401a9dc19e95d8b420ee100ac022208 (gh-12360).
Diffstat (limited to 'Python/ceval_gil.h')
| -rw-r--r-- | Python/ceval_gil.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h index d9ad361..f2d5fdb 100644 --- a/Python/ceval_gil.h +++ b/Python/ceval_gil.h @@ -176,7 +176,7 @@ static void drop_gil(PyThreadState *tstate) &_PyRuntime.ceval.gil.last_holder) ) == tstate) { - RESET_GIL_DROP_REQUEST(tstate->interp); + RESET_GIL_DROP_REQUEST(); /* NOTE: if COND_WAIT does not atomically start waiting when releasing the mutex, another thread can run through, take the GIL and drop it again, and reset the condition @@ -213,7 +213,7 @@ static void take_gil(PyThreadState *tstate) if (timed_out && _Py_atomic_load_relaxed(&_PyRuntime.ceval.gil.locked) && _PyRuntime.ceval.gil.switch_number == saved_switchnum) { - SET_GIL_DROP_REQUEST(tstate->interp); + SET_GIL_DROP_REQUEST(); } } _ready: @@ -239,10 +239,10 @@ _ready: MUTEX_UNLOCK(_PyRuntime.ceval.gil.switch_mutex); #endif if (_Py_atomic_load_relaxed(&_PyRuntime.ceval.gil_drop_request)) { - RESET_GIL_DROP_REQUEST(tstate->interp); + RESET_GIL_DROP_REQUEST(); } if (tstate->async_exc != NULL) { - _PyEval_SignalAsyncExc(tstate->interp); + _PyEval_SignalAsyncExc(); } MUTEX_UNLOCK(_PyRuntime.ceval.gil.mutex); |