Skip to content

gh-104341: Minor Fixes in the _thread Module #104595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ericsnowcurrently wants to merge 11 commits into from
Closed

gh-104341: Minor Fixes in the _thread Module #104595

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c066237
Add struct module_thread.
ericsnowcurrently May 17, 2023
d10a24f
Add module_thread.daemonic.
ericsnowcurrently May 17, 2023
dfcc14f
Add module_thread.status and related helpers.
ericsnowcurrently May 17, 2023
6fca20e
Add struct module_threads.
ericsnowcurrently May 17, 2023
921b1ec
Free bootstate before running PyObject_Call().
ericsnowcurrently May 18, 2023
fcee99e
Drop PyInterpreterState.threads.count.
ericsnowcurrently May 18, 2023
8da0aee
Add a TODO.
ericsnowcurrently May 18, 2023
a7016b2
Drop an unused field.
ericsnowcurrently May 18, 2023
a44c03f
Fix untrack_module_thread().
ericsnowcurrently May 18, 2023
7cca8fa
Fix warnings.
ericsnowcurrently May 18, 2023
d1e770c
Fix module_threads_reinit().
ericsnowcurrently May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add struct module_thread.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 17, 2023
commit c0662373bf79968d3a10f900a841774c47ca83ed
76 changes: 59 additions & 17 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,53 @@
static struct PyModuleDef thread_module;


/* threads owned by the module */

struct module_thread {
PyThreadState *tstate;
};

static struct module_thread *
new_module_thread(PyInterpreterState *interp)
{
PyThreadState *tstate = _PyThreadState_New(interp);
if (tstate == NULL) {
if (!PyErr_Occurred()) {
PyErr_NoMemory();
}
return NULL;
}

struct module_thread *mt = PyMem_RawMalloc(sizeof(struct module_thread));
if (mt == NULL) {
PyThreadState_Clear(tstate);
PyThreadState_Delete(tstate);
if (!PyErr_Occurred()) {
PyErr_NoMemory();
}
return NULL;
}

*mt = (struct module_thread){
.tstate = tstate,
};
return mt;
}

static void
delete_module_thread(struct module_thread *mt)
{
if (mt->tstate != NULL) {
PyThreadState_Clear(mt->tstate);
PyThreadState_Delete(mt->tstate);
mt->tstate = NULL;
}
PyMem_RawFree(mt);
}


/* module state */

typedef struct {
PyTypeObject *excepthook_type;
PyTypeObject *lock_type;
Expand Down Expand Up @@ -1048,12 +1095,10 @@ _localdummy_destroyed(PyObject *localweakref, PyObject *dummyweakref)
/* Module functions */

struct bootstate {
PyInterpreterState *interp;
struct module_thread *module_thread;
PyObject *func;
PyObject *args;
PyObject *kwargs;
PyThreadState *tstate;
_PyRuntimeState *runtime;
};


Expand All @@ -1071,9 +1116,9 @@ static void
thread_run(void *boot_raw)
{
struct bootstate *boot = (struct bootstate *) boot_raw;
PyThreadState *tstate;
struct module_thread *mt = boot->module_thread;
PyThreadState *tstate = mt->tstate;

tstate = boot->tstate;
_PyThreadState_Bind(tstate);
PyEval_AcquireThread(tstate);
tstate->interp->threads.count++;
Expand All @@ -1095,6 +1140,8 @@ thread_run(void *boot_raw)
tstate->interp->threads.count--;
PyThreadState_Clear(tstate);
_PyThreadState_DeleteCurrent(tstate);
mt->tstate = NULL;
delete_module_thread(mt);

// bpo-44434: Don't call explicitly PyThread_exit_thread(). On Linux with
// the glibc, pthread_exit() can abort the whole process if dlopen() fails
Expand Down Expand Up @@ -1122,7 +1169,6 @@ and False otherwise.\n");
static PyObject *
thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
{
_PyRuntimeState *runtime = &_PyRuntime;
PyObject *func, *args, *kwargs = NULL;

if (!PyArg_UnpackTuple(fargs, "start_new_thread", 2, 3,
Expand Down Expand Up @@ -1156,28 +1202,24 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
return NULL;
}

struct module_thread *mt = new_module_thread(interp);
if (mt == NULL) {
return NULL;
}

struct bootstate *boot = PyMem_NEW(struct bootstate, 1);
if (boot == NULL) {
return PyErr_NoMemory();
}
boot->interp = _PyInterpreterState_GET();
boot->tstate = _PyThreadState_New(boot->interp);
if (boot->tstate == NULL) {
PyMem_Free(boot);
if (!PyErr_Occurred()) {
return PyErr_NoMemory();
}
return NULL;
}
boot->runtime = runtime;
boot->module_thread = mt;
boot->func = Py_NewRef(func);
boot->args = Py_NewRef(args);
boot->kwargs = Py_XNewRef(kwargs);

unsigned long ident = PyThread_start_new_thread(thread_run, (void*) boot);
if (ident == PYTHREAD_INVALID_THREAD_ID) {
PyErr_SetString(ThreadError, "can't start new thread");
PyThreadState_Clear(boot->tstate);
delete_module_thread(mt);
thread_bootstate_free(boot);
return NULL;
}
Expand Down