Clarify distinction between main thread handling calls and main threa…

…d handling signals.
python · Oct 2, 2023 · 200f545 · 200f545
1 parent 134ae82
commit 200f545
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Python/ceval_gil.c b/Python/ceval_gil.c
@@ -68,14 +68,17 @@ update_eval_breaker_from_thread(PyInterpreterState *interp, PyThreadState *tstat
     if (tstate == NULL) {
         return;
     }
-    if (_Py_ThreadCanHandleSignals(interp)) {
+
+    if (_Py_IsMainThread()) {
         int32_t calls_to_do = _Py_atomic_load_int32_relaxed(
             &_PyRuntime.ceval.pending_mainthread.calls_to_do);
         if (calls_to_do) {
             _Py_set_eval_breaker_bit(interp, _PY_CALLS_TO_DO_BIT, 1);
         }
-        if (_Py_atomic_load(&_PyRuntime.signals.is_tripped)) {
-            _Py_set_eval_breaker_bit(interp, _PY_SIGNALS_PENDING_BIT, 1);
+        if (!_Py_ThreadCanHandleSignals(interp)) {
+            if (_Py_atomic_load(&_PyRuntime.signals.is_tripped)) {
+                _Py_set_eval_breaker_bit(interp, _PY_SIGNALS_PENDING_BIT, 1);
+            }
         }
     }
     if (tstate->async_exc != NULL) {