diff options
| author | Mark Shannon <mark@hotpy.org> | 2021-07-19 10:10:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 10:10:21 (GMT) |
| commit | d09c13417890427f829e3df297beb0e27133f8f4 (patch) | |
| tree | ab7ab13ffb0257d4e9947ae6ed08fcf1368ce746 | |
| parent | aab1899c9d79083c1ff31d974ed8b562d3ca3b5d (diff) | |
| download | cpython-d09c13417890427f829e3df297beb0e27133f8f4.zip cpython-d09c13417890427f829e3df297beb0e27133f8f4.tar.gz cpython-d09c13417890427f829e3df297beb0e27133f8f4.tar.bz2 | |
bpo-44645: Check for interrupts on any potentially backwards edge (GH-27216)
| -rw-r--r-- | Lib/test/test_threading.py | 25 | ||||
| -rw-r--r-- | Python/ceval.c | 7 |
2 files changed, 31 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index f648a8b..23fe2d3 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -1604,6 +1604,31 @@ class InterruptMainTests(unittest.TestCase): 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] + interrupted = [False] + + def worker(started, cont, interrupted): + iterations = 100_000_000 + started[0] = True + while cont[0]: + if iterations: + iterations -= 1 + else: + return + pass + interrupted[0] = True + + t = threading.Thread(target=worker,args=(started, cont, interrupted)) + t.start() + while not started[0]: + pass + cont[0] = False + t.join() + self.assertTrue(interrupted[0]) + class AtexitTests(unittest.TestCase): diff --git a/Python/ceval.c b/Python/ceval.c index a6eb83a..90112aa 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) ; |