mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
(cherry picked from commit 000e70ad52)

Co-authored-by: Mark Shannon <mark@hotpy.org>
This commit is contained in:
Mark Shannon 2021-07-16 11:48:46 +01:00 • committed by GitHub
parent 705988056e
commit 0e349ea554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/test_threading.py
View file

@ -1604,6 +1604,31 @@ class InterruptMainTests(unittest.TestCase):
self.assertRaises(ValueError, _thread.interrupt_main, signal.NSIG) self.assertRaises(ValueError, _thread.interrupt_main, signal.NSIG)
self.assertRaises(ValueError, _thread.interrupt_main, 1000000) 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): class AtexitTests(unittest.TestCase):

7
Python/ceval.c
View file

@ -3759,14 +3759,17 @@ main_loop:
if (Py_IsFalse(cond)) { if (Py_IsFalse(cond)) {
Py_DECREF(cond); Py_DECREF(cond);
JUMPTO(oparg); JUMPTO(oparg);
CHECK_EVAL_BREAKER();
DISPATCH(); DISPATCH();
} }
err = PyObject_IsTrue(cond); err = PyObject_IsTrue(cond);
Py_DECREF(cond); Py_DECREF(cond);
if (err > 0) if (err > 0)
; ;
else if (err == 0) else if (err == 0) {
JUMPTO(oparg); JUMPTO(oparg);
CHECK_EVAL_BREAKER();
}
else else
goto error; goto error;
DISPATCH(); DISPATCH();
@ -3783,12 +3786,14 @@ main_loop:
if (Py_IsTrue(cond)) { if (Py_IsTrue(cond)) {
Py_DECREF(cond); Py_DECREF(cond);
JUMPTO(oparg); JUMPTO(oparg);
CHECK_EVAL_BREAKER();
DISPATCH(); DISPATCH();
} }
err = PyObject_IsTrue(cond); err = PyObject_IsTrue(cond);
Py_DECREF(cond); Py_DECREF(cond);
if (err > 0) { if (err > 0) {
JUMPTO(oparg); JUMPTO(oparg);
CHECK_EVAL_BREAKER();
} }
else if (err == 0) else if (err == 0)
; ;