[Python-checkins] [3.10] bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167) (GH-27183)
pablogsal
webhook-mailer at python.org
Fri Jul 16 06:48:51 EDT 2021
https://github.com/python/cpython/commit/0e349ea5541104c76cafc173bfcfef8de872f96f
commit: 0e349ea5541104c76cafc173bfcfef8de872f96f
branch: 3.10
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-07-16T11:48:46+01:00
summary:
[3.10] bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167) (GH-27183)
(cherry picked from commit 000e70ad5246732fcbd27cf59268185cbd5ad734)
Co-authored-by: Mark Shannon <mark at hotpy.org>
files:
M Lib/test/test_threading.py
M Python/ceval.c
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index f648a8b2bc52f..3b5bc42357e58 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1604,6 +1604,31 @@ 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 6482c8892d43f..429ddb82bd66d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3759,14 +3759,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();
@@ -3783,12 +3786,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)
;
More information about the Python-checkins
mailing list