From b8b6d0c2c63bcd9252ce20ef990da093dda8b8ce Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Sat, 28 Jun 2003 21:53:52 +0000 Subject: Add PyThreadState_SetAsyncExc(long, PyObject *). A new API (only accessible from C) to interrupt a thread by sending it an exception. This is not always effective, but might help some people. Requested by Just van Rossum and Alex Martelli. It is intentional that you have to write your own C extension to call it from Python. Docs will have to wait. --- Python/ceval.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'Python/ceval.c') diff --git a/Python/ceval.c b/Python/ceval.c index 4e5b472299..07862d0efe 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -290,7 +290,7 @@ static PyTypeObject gentype = { extern int _PyThread_Started; /* Flag for Py_Exit */ -static PyThread_type_lock interpreter_lock = 0; +static PyThread_type_lock interpreter_lock = 0; /* This is the GIL */ static long main_thread = 0; void @@ -773,6 +773,11 @@ eval_frame(PyFrameObject *f) Py_MakePendingCalls() above. */ if (--_Py_Ticker < 0) { + if (*next_instr == SETUP_FINALLY) { + /* Make the last opcode before + a try: finally: block uninterruptable. */ + goto fast_next_opcode; + } _Py_Ticker = _Py_CheckInterval; tstate->tick_counter++; if (things_to_do) { @@ -805,6 +810,17 @@ eval_frame(PyFrameObject *f) PyThread_acquire_lock(interpreter_lock, 1); if (PyThreadState_Swap(tstate) != NULL) Py_FatalError("ceval: orphan tstate"); + + /* Check for thread interrupts */ + + if (tstate->async_exc != NULL) { + x = tstate->async_exc; + tstate->async_exc = NULL; + PyErr_SetNone(x); + Py_DECREF(x); + why = WHY_EXCEPTION; + goto on_error; + } } #endif } -- cgit v1.2.1