diff options
| author | Victor Stinner <vstinner@python.org> | 2020-03-18 18:28:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 18:28:53 (GMT) |
| commit | 8849e5962ba481d5d414b3467a256aba2134b4da (patch) | |
| tree | 469b2d1023971843ce4e29f88ecbc8503342830f /Python | |
| parent | 1c60567b9a4c8f77e730de9d22690d8e68d7e5f6 (diff) | |
| download | cpython-8849e5962ba481d5d414b3467a256aba2134b4da.zip cpython-8849e5962ba481d5d414b3467a256aba2134b4da.tar.gz cpython-8849e5962ba481d5d414b3467a256aba2134b4da.tar.bz2 | |
bpo-39984: trip_signal() uses PyGILState_GetThisThreadState() (GH-19061)
bpo-37127, bpo-39984:
* trip_signal() and Py_AddPendingCall() now get the current Python
thread state using PyGILState_GetThisThreadState() rather than
_PyRuntimeState_GetThreadState() to be able to get it even if the
GIL is released.
* _PyEval_SignalReceived() now expects tstate rather than ceval.
* Remove ceval parameter of _PyEval_AddPendingCall(): ceval is now
get from tstate parameter.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 8958e14..2f65ea2 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -436,8 +436,9 @@ PyEval_RestoreThread(PyThreadState *tstate) */ void -_PyEval_SignalReceived(struct _ceval_runtime_state *ceval) +_PyEval_SignalReceived(PyThreadState *tstate) { + struct _ceval_runtime_state *ceval = &tstate->interp->runtime->ceval; /* bpo-30703: Function called when the C signal handler of Python gets a signal. We cannot queue a callback using Py_AddPendingCall() since that function is not async-signal-safe. */ @@ -482,9 +483,9 @@ _pop_pending_call(struct _pending_calls *pending, int _PyEval_AddPendingCall(PyThreadState *tstate, - struct _ceval_runtime_state *ceval, int (*func)(void *), void *arg) { + struct _ceval_runtime_state *ceval = &tstate->interp->runtime->ceval; struct _pending_calls *pending = &ceval->pending; PyThread_acquire_lock(pending->lock, WAIT_LOCK); @@ -511,9 +512,12 @@ _PyEval_AddPendingCall(PyThreadState *tstate, int Py_AddPendingCall(int (*func)(void *), void *arg) { - _PyRuntimeState *runtime = &_PyRuntime; - PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime); - return _PyEval_AddPendingCall(tstate, &runtime->ceval, func, arg); + /* Get the Python thread state using PyGILState API, since + _PyThreadState_GET() returns NULL if the GIL is released. + Py_AddPendingCall() doesn't require the caller to hold the GIL. */ + PyThreadState *tstate = PyGILState_GetThisThreadState(); + assert(tstate != NULL); + return _PyEval_AddPendingCall(tstate, func, arg); } static int |