Skip to content

gh-104341: Clean Up threading Module #104552

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 12 commits into from
Closed

gh-104341: Clean Up threading Module #104552

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3474f3
Drop bootstate.interp and bootstate.runtime.
ericsnowcurrently May 15, 2023
ec9f53b
Add module-owned threads to module state.
ericsnowcurrently May 15, 2023
05aa205
Call on_delete() in remove_module_thread().
ericsnowcurrently May 15, 2023
da85eed
Drop interp.threads.count.
ericsnowcurrently May 15, 2023
004589b
Pass module_state to newlockobject().
ericsnowcurrently May 15, 2023
aa4d3bb
Create the thread lock in threading.py.
ericsnowcurrently May 15, 2023
82ff2ba
Re-initialize the module threads lock upon fork.
ericsnowcurrently May 15, 2023
a19c684
Add module_thread.running_lock.
ericsnowcurrently May 15, 2023
de530b1
Be more specific in _wait_for_tstate_lock().
ericsnowcurrently May 16, 2023
e2c7058
Fix _set_sentinel().
ericsnowcurrently May 16, 2023
0d30811
Track the "main" thread too.
ericsnowcurrently May 16, 2023
86e5d82
Drop tstate->on_delete.
ericsnowcurrently May 16, 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
Prev Previous commit
Next Next commit
Pass module_state to newlockobject().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 15, 2023
commit 004589be6d8489c2b75cac5c908e5fdd96cf09ef
16 changes: 8 additions & 8 deletions Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,10 +736,8 @@ static PyType_Spec rlock_type_spec = {
};

static lockobject *
newlockobject(PyObject *module)
newlockobject(thread_module_state *state)
{
thread_module_state *state = get_thread_state(module);

PyTypeObject *type = state->lock_type;
lockobject *self = (lockobject *)type->tp_alloc(type, 0);
if (self == NULL) {
Expand Down Expand Up @@ -1384,12 +1382,13 @@ A subthread can use this function to interrupt the main thread.\n\
Note: the default signal handler for SIGINT raises ``KeyboardInterrupt``."
);

static lockobject *newlockobject(PyObject *module);
static lockobject *newlockobject(thread_module_state *);

static PyObject *
thread_PyThread_allocate_lock(PyObject *module, PyObject *Py_UNUSED(ignored))
{
return (PyObject *) newlockobject(module);
thread_module_state *state = get_thread_state(module);
return (PyObject *) newlockobject(state);
}

PyDoc_STRVAR(allocate_doc,
Expand Down Expand Up @@ -1440,8 +1439,8 @@ particular thread within a system.");
static PyObject *
thread__count(PyObject *self, PyObject *Py_UNUSED(ignored))
{
PyInterpreterState *interp = _PyInterpreterState_GET();
return PyLong_FromLong(interp->threads.count);
thread_module_state *state = get_thread_state(self);
return PyLong_FromLong(state->threads.num_running);
}

PyDoc_STRVAR(_count_doc,
Expand Down Expand Up @@ -1482,6 +1481,7 @@ thread__set_sentinel(PyObject *module, PyObject *Py_UNUSED(ignored))
{
PyObject *wr;
PyThreadState *tstate = _PyThreadState_GET();
thread_module_state *state = get_thread_state(module);
lockobject *lock;

if (tstate->on_delete_data != NULL) {
Expand All @@ -1493,7 +1493,7 @@ thread__set_sentinel(PyObject *module, PyObject *Py_UNUSED(ignored))
tstate->on_delete_data = NULL;
Py_DECREF(wr);
}
lock = newlockobject(module);
lock = newlockobject(state);
if (lock == NULL)
return NULL;
/* The lock is owned by whoever called _set_sentinel(), but the weakref
Expand Down