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

This commit is contained in:
Mark Shannon 2021-07-16 10:59:31 +01:00 committed by GitHub
parent d9f923280f
commit 000e70ad52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions

View File

@ -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):

View File

@ -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)
;