From bc9bc2d566cf5e9c5dfb1054565059d47e1f093d Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 16 Jul 2021 18:05:47 +0100 Subject: [PATCH] Revert "bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)" (GH-27194) This reverts commit 000e70ad5246732fcbd27cf59268185cbd5ad734. (cherry picked from commit c90c591e5158ab7b531dcd6e2a5f00bc70ba7637) Co-authored-by: Pablo Galindo Salgado --- Lib/test/test_threading.py | 25 ------------------------- Python/ceval.c | 7 +------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 3b5bc42357e586..f648a8b2bc52f5 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -1604,31 +1604,6 @@ 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 429ddb82bd66d4..6482c8892d43f1 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3759,17 +3759,14 @@ _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(); @@ -3786,14 +3783,12 @@ _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) ;