1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 000e70ad5246732fcbd27cf59268185cbd5ad734.
This commit is contained in:
Pablo Galindo Salgado 2021-07-16 18:05:47 +01:00 committed by GitHub
parent e9cd47d0e5
commit c90c591e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Lib/test/test_threading.py
View File

@ -1604,31 +1604,6 @@ 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

@ -3638,17 +3638,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
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();
@ -3665,14 +3662,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
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)
; ;