diff options
| author | Mark Shannon <mark@hotpy.org> | 2021-07-16 09:59:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 09:59:31 (GMT) |
| commit | 000e70ad5246732fcbd27cf59268185cbd5ad734 (patch) | |
| tree | 0026731df9524df861b876f52d8968c368d11a76 | |
| parent | d9f923280f204204f8703756aef4f655b579b4b8 (diff) | |
| download | cpython-000e70ad5246732fcbd27cf59268185cbd5ad734.zip cpython-000e70ad5246732fcbd27cf59268185cbd5ad734.tar.gz cpython-000e70ad5246732fcbd27cf59268185cbd5ad734.tar.bz2 | |
bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)
| -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..3b5bc42 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 + 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 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) ; |