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

vstinner · web-flow · commit 4e01946cafca · 2020-05-05T15:43:37.000+02:00
Move signals_pending from _PyRuntime.ceval to
PyInterpreterState.ceval.
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -43,6 +43,8 @@ struct _ceval_state {
        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;
 };
 
 
diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -17,8 +17,6 @@ struct _ceval_runtime_state {
     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;
 };
 
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -148,7 +148,7 @@ COMPUTE_EVAL_BREAKER(PyInterpreterState *interp,
 {
     _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 @@ SIGNAL_PENDING_SIGNALS(PyInterpreterState *interp)
 {
     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 @@ UNSIGNAL_PENDING_SIGNALS(PyInterpreterState *interp)
 {
     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 @@ eval_frame_handle_pending(PyThreadState *tstate)
 {
     _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;

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ COMPUTE_EVAL_BREAKER(PyInterpreterState *interp,`
`148`	`148`	`{`
`149`	`149`	`_Py_atomic_store_relaxed(&ceval2->eval_breaker,`
`150`	`150`	`_Py_atomic_load_relaxed(&ceval->gil_drop_request)`
`151`		`- \| (_Py_atomic_load_relaxed(&ceval->signals_pending)`
	`151`	`+ \| (_Py_atomic_load_relaxed(&ceval2->signals_pending)`
`152`	`152`	`&& _Py_ThreadCanHandleSignals(interp))`
`153`	`153`	`\| (_Py_atomic_load_relaxed(&ceval2->pending.calls_to_do)`
`154`	`154`	`&& _Py_ThreadCanHandlePendingCalls())`
`@@ -201,7 +201,7 @@ SIGNAL_PENDING_SIGNALS(PyInterpreterState *interp)`
`201`	`201`	`{`
`202`	`202`	`struct _ceval_runtime_state *ceval = &interp->runtime->ceval;`
`203`	`203`	`struct _ceval_state *ceval2 = &interp->ceval;`
`204`		`- _Py_atomic_store_relaxed(&ceval->signals_pending, 1);`
	`204`	`+ _Py_atomic_store_relaxed(&ceval2->signals_pending, 1);`
`205`	`205`	`/* eval_breaker is not set to 1 if thread_can_handle_signals() is false */`
`206`	`206`	`COMPUTE_EVAL_BREAKER(interp, ceval, ceval2);`
`207`	`207`	`}`
`@@ -212,7 +212,7 @@ UNSIGNAL_PENDING_SIGNALS(PyInterpreterState *interp)`
`212`	`212`	`{`
`213`	`213`	`struct _ceval_runtime_state *ceval = &interp->runtime->ceval;`
`214`	`214`	`struct _ceval_state *ceval2 = &interp->ceval;`
`215`		`- _Py_atomic_store_relaxed(&ceval->signals_pending, 0);`
	`215`	`+ _Py_atomic_store_relaxed(&ceval2->signals_pending, 0);`
`216`	`216`	`COMPUTE_EVAL_BREAKER(interp, ceval, ceval2);`
`217`	`217`	`}`
`218`	`218`
`@@ -830,16 +830,16 @@ eval_frame_handle_pending(PyThreadState *tstate)`
`830`	`830`	`{`
`831`	`831`	`_PyRuntimeState * const runtime = &_PyRuntime;`
`832`	`832`	`struct _ceval_runtime_state *ceval = &runtime->ceval;`
	`833`	`+ struct _ceval_state *ceval2 = &tstate->interp->ceval;`
`833`	`834`
`834`	`835`	`/* Pending signals */`
`835`		`- if (_Py_atomic_load_relaxed(&ceval->signals_pending)) {`
	`836`	`+ if (_Py_atomic_load_relaxed(&ceval2->signals_pending)) {`
`836`	`837`	`if (handle_signals(tstate) != 0) {`
`837`	`838`	`return -1;`
`838`	`839`	`}`
`839`	`840`	`}`
`840`	`841`
`841`	`842`	`/* Pending calls */`
`842`		`- struct _ceval_state *ceval2 = &tstate->interp->ceval;`
`843`	`843`	`if (_Py_atomic_load_relaxed(&ceval2->pending.calls_to_do)) {`
`844`	`844`	`if (make_pending_calls(tstate) != 0) {`
`845`	`845`	`return -1;`