[Python-checkins] bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)

[markshannon]

https://github.com/python/cpython/commit/000e70ad5246732fcbd27cf59268185cbd5ad734
commit: 000e70ad5246732fcbd27cf59268185cbd5ad734
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2021-07-16T10:59:31+01:00
summary:

bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)

files:
M Lib/test/test_threading.py
M Python/ceval.c

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index f648a8b2bc52f..3b5bc42357e58 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1604,6 +1604,31 @@ def test_interrupt_main_invalid_signal(self):
         self.assertRaises(ValueError, _thread.interrupt_main, signal.NSIG)
         self.assertRaises(ValueError, _thread.interrupt_main, 1000000)
 
+    @threading_helper.reap_threads
+    def test_can_interrupt_tight_loops(self):
+        cont = True
+        started = False
+        iterations = 100_000_000
+
+        def worker():
+            nonlocal iterations
+            nonlocal started
+            started = True
+            while cont:
+                if iterations:
+                    iterations -= 1
+                else:
+                    return
+                pass
+
+        t = threading.Thread(target=worker)
+        t.start()
+        while not started:
+            pass
+        cont = False
+        t.join()
+        self.assertNotEqual(iterations, 0)
+
 
 class AtexitTests(unittest.TestCase):
 
diff --git a/Python/ceval.c b/Python/ceval.c
index a6eb83a4909d7..90112aa3f9476 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3638,14 +3638,17 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
             if (Py_IsFalse(cond)) {
                 Py_DECREF(cond);
                 JUMPTO(oparg);
+                CHECK_EVAL_BREAKER();
                 DISPATCH();
             }
             err = PyObject_IsTrue(cond);
             Py_DECREF(cond);
             if (err > 0)
                 ;
-            else if (err == 0)
+            else if (err == 0) {
                 JUMPTO(oparg);
+                CHECK_EVAL_BREAKER();
+            }
             else
                 goto error;
             DISPATCH();
@@ -3662,12 +3665,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
             if (Py_IsTrue(cond)) {
                 Py_DECREF(cond);
                 JUMPTO(oparg);
+                CHECK_EVAL_BREAKER();
                 DISPATCH();
             }
             err = PyObject_IsTrue(cond);
             Py_DECREF(cond);
             if (err > 0) {
                 JUMPTO(oparg);
+                CHECK_EVAL_BREAKER();
             }
             else if (err == 0)
                 ;