commit 4e01946cafca0cf49f796c3118e0d65237bcad69
author Victor Stinner <vstinner@python.org> Tue May 05 15:43:37 2020 +0200
committer GitHub <noreply@github.com> Tue May 05 15:43:37 2020 +0200
tree 754267420acd250b7cd0368c8679fbaee72bb2ee
parent f01d1be97d740ea0369379ca305646a26694236e

bpo-40513: Per-interpreter signals pending (GH-19924)

Move signals_pending from _PyRuntime.ceval to
PyInterpreterState.ceval.

Include/internal/pycore_interp.h

diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
index 6e9937c..251ee06 100644
--- a/Include/internal/pycore_interp.h
+++ b/Include/internal/pycore_interp.h
@@ -43,6 +43,8 @@
        the fast path in the eval loop. */
     _Py_atomic_int eval_breaker;
     struct _pending_calls pending;
+    /* Request for checking signals. */
+    _Py_atomic_int signals_pending;
 };
 
 

Include/internal/pycore_runtime.h

diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
index 995fe23..d432c6c 100644
--- a/Include/internal/pycore_runtime.h
+++ b/Include/internal/pycore_runtime.h
@@ -17,8 +17,6 @@
     int recursion_limit;
     /* Request for dropping the GIL */
     _Py_atomic_int gil_drop_request;
-    /* Request for checking signals. */
-    _Py_atomic_int signals_pending;
     struct _gil_runtime_state gil;
 };
 

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index e15d7e0..addc026 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -148,7 +148,7 @@
 {
     _Py_atomic_store_relaxed(&ceval2->eval_breaker,
         _Py_atomic_load_relaxed(&ceval->gil_drop_request)
-        | (_Py_atomic_load_relaxed(&ceval->signals_pending)
+        | (_Py_atomic_load_relaxed(&ceval2->signals_pending)
            && _Py_ThreadCanHandleSignals(interp))
         | (_Py_atomic_load_relaxed(&ceval2->pending.calls_to_do)
            && _Py_ThreadCanHandlePendingCalls())
@@ -201,7 +201,7 @@
 {
     struct _ceval_runtime_state *ceval = &interp->runtime->ceval;
     struct _ceval_state *ceval2 = &interp->ceval;
-    _Py_atomic_store_relaxed(&ceval->signals_pending, 1);
+    _Py_atomic_store_relaxed(&ceval2->signals_pending, 1);
     /* eval_breaker is not set to 1 if thread_can_handle_signals() is false */
     COMPUTE_EVAL_BREAKER(interp, ceval, ceval2);
 }
@@ -212,7 +212,7 @@
 {
     struct _ceval_runtime_state *ceval = &interp->runtime->ceval;
     struct _ceval_state *ceval2 = &interp->ceval;
-    _Py_atomic_store_relaxed(&ceval->signals_pending, 0);
+    _Py_atomic_store_relaxed(&ceval2->signals_pending, 0);
     COMPUTE_EVAL_BREAKER(interp, ceval, ceval2);
 }
 
@@ -830,16 +830,16 @@
 {
     _PyRuntimeState * const runtime = &_PyRuntime;
     struct _ceval_runtime_state *ceval = &runtime->ceval;
+    struct _ceval_state *ceval2 = &tstate->interp->ceval;
 
     /* Pending signals */
-    if (_Py_atomic_load_relaxed(&ceval->signals_pending)) {
+    if (_Py_atomic_load_relaxed(&ceval2->signals_pending)) {
         if (handle_signals(tstate) != 0) {
             return -1;
         }
     }
 
     /* Pending calls */
-    struct _ceval_state *ceval2 = &tstate->interp->ceval;
     if (_Py_atomic_load_relaxed(&ceval2->pending.calls_to_do)) {
         if (make_pending_calls(tstate) != 0) {
             return -1;