mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
bpo-37266: Daemon threads are now denied in subinterpreters (GH-14049)
In a subinterpreter, spawning a daemon thread now raises an exception. Daemon threads were never supported in subinterpreters. Previously, the subinterpreter finalization crashed with a Pyton fatal error if a daemon thread was still running. * Add _thread._is_main_interpreter() * threading.Thread.start() now raises RuntimeError if the thread is a daemon thread and the method is called from a subinterpreter. * The _thread module now uses Argument Clinic for the new function. * Use textwrap.dedent() in test_threading.SubinterpThreadingTests
This commit is contained in:
parent
212646cae6
commit
066e5b1a91
8 changed files with 113 additions and 29 deletions
|
@ -8,6 +8,14 @@
|
|||
#include "structmember.h" /* offsetof */
|
||||
#include "pythread.h"
|
||||
|
||||
#include "clinic/_threadmodule.c.h"
|
||||
|
||||
/*[clinic input]
|
||||
module _thread
|
||||
[clinic start generated code]*/
|
||||
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=be8dbe5cc4b16df7]*/
|
||||
|
||||
|
||||
static PyObject *ThreadError;
|
||||
static PyObject *str_dict;
|
||||
|
||||
|
@ -1442,6 +1450,21 @@ PyDoc_STRVAR(excepthook_doc,
|
|||
\n\
|
||||
Handle uncaught Thread.run() exception.");
|
||||
|
||||
/*[clinic input]
|
||||
_thread._is_main_interpreter
|
||||
|
||||
Return True if the current interpreter is the main Python interpreter.
|
||||
[clinic start generated code]*/
|
||||
|
||||
static PyObject *
|
||||
_thread__is_main_interpreter_impl(PyObject *module)
|
||||
/*[clinic end generated code: output=7dd82e1728339adc input=cc1eb00fd4598915]*/
|
||||
{
|
||||
_PyRuntimeState *runtime = &_PyRuntime;
|
||||
PyInterpreterState *interp = _PyRuntimeState_GetThreadState(runtime)->interp;
|
||||
return PyBool_FromLong(interp == runtime->interpreters.main);
|
||||
}
|
||||
|
||||
static PyMethodDef thread_methods[] = {
|
||||
{"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
|
||||
METH_VARARGS, start_new_doc},
|
||||
|
@ -1471,6 +1494,7 @@ static PyMethodDef thread_methods[] = {
|
|||
METH_NOARGS, _set_sentinel_doc},
|
||||
{"_excepthook", thread_excepthook,
|
||||
METH_O, excepthook_doc},
|
||||
_THREAD__IS_MAIN_INTERPRETER_METHODDEF
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue