8000 gh-109860: Use a New Thread State When Switching Interpreters, When Necessary by ericsnowcurrently · Pull Request #110245 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-109860: Use a New Thread State When Switching Interpreters, When Necessary #110245

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

Merged
merged 13 commits into from
Oct 3, 2023
Merged

gh-109860: Use a New Thread State When Switching Interpreters, When Necessary #110245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2117772
Add PyThreadState._whence.
ericsnowcurrently Sep 25, 2023
23828a3
Add an assert.
ericsnowcurrently Sep 25, 2023
b807906
Set up interp->_initial_thread for re-use.
ericsnowcurrently Sep 25, 2023
3e10a5c
Use a local PyThreadState in _PyInterpreterState_IDDecref().
ericsnowcurrently Sep 25, 2023
15e978a
Use a local PyThreadState in _xxsubinterpreters.
ericsnowcurrently Sep 26, 2023
0b60d6d
Throw away the initial thread state.
ericsnowcurrently Sep 26, 2023
781cb53
Use existing API.
ericsnowcurrently Sep 27, 2023
cd288b5
Release threading._main_thread._tstate_lock in _PyInterpreterState_Se…
ericsnowcurrently Sep 27, 2023
4afdf7b
Drop an assert (fork is messy).
ericsnowcurrently Sep 27, 2023
aba79e3
Add _PyInterpreterState_FailIfRunningMain().
ericsnowcurrently Sep 27, 2023
2c18554
Propagate "alraedy running" properly.
ericsnowcurrently Sep 27, 2023
845c2bd
Fix handling of no-memory in _sharedexception_bind().
ericsnowcurrently Sep 27, 2023
fec49b2
Fix some typos.
ericsnowcurrently Oct 2, 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 PyThreadState._whence.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 2, 2023
commit 2117772f65a3b749702655ffc3261565091e2102
8 changes: 8 additions & 0 deletions Include/cpython/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ struct _ts {
/* padding to align to 4 bytes */
unsigned int :24;
} _status;
#ifdef Py_BUILD_CORE
# define _PyThreadState_WHENCE_NOTSET -1
# define _PyThreadState_WHENCE_UNKNOWN 0
# define _PyThreadState_WHENCE_INTERP 1
# define _PyThreadState_WHENCE_THREADING 2
# define _PyThreadState_WHENCE_GILSTATE 3
#endif
int _whence;

int py_recursion_remaining;
int py_recursion_limit;
Expand Down
4 changes: 3 additions & 1 deletion Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ static inline PyInterpreterState* _PyInterpreterState_GET(void) {

// PyThreadState functions

extern PyThreadState * _PyThreadState_New(PyInterpreterState *interp);
extern PyThreadState * _PyThreadState_New(
PyInterpreterState *interp,
int whence);
extern void _PyThreadState_Bind(PyThreadState *tstate);
extern void _PyThreadState_DeleteExcept(PyThreadState *tstate);

Expand Down
1 change: 1 addition & 0 deletions Include/internal/pycore_runtime_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ extern PyTypeObject _PyExc_MemoryError;

#define _PyThreadState_INIT \
{ \
._whence = _PyThreadState_WHENCE_NOTSET, \
.py_recursion_limit = Py_DEFAULT_RECURSION_LIMIT, \
.context_ver = 1, \
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
if (boot == NULL) {
return PyErr_NoMemory();
}
boot->tstate = _PyThreadState_New(interp);
boot->tstate = _PyThreadState_New(interp, _PyThreadState_WHENCE_THREADING);
if (boot->tstate == NULL) {
PyMem_RawFree(boot);
if (!PyErr_Occurred()) {
Expand Down
6 changes: 4 additions & 2 deletions Python/pylifecycle.c
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,8 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
return status;
}

PyThreadState *tstate = _PyThreadState_New(interp);
PyThreadState *tstate = _PyThreadState_New(interp,
_PyThreadState_WHENCE_INTERP);
if (tstate == NULL) {
return _PyStatus_ERR("can't make first thread");
}
Expand Down Expand Up @@ -2050,7 +2051,8 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
return _PyStatus_OK();
}

PyThreadState *tstate = _PyThreadState_New(interp);
PyThreadState *tstate = _PyThreadState_New(interp,
_PyThreadState_WHENCE_INTERP);
if (tstate == NULL) {
PyInterpreterState_Delete(interp);
*tstate_p = NULL;
Expand Down
23 changes: 15 additions & 8 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@ free_threadstate(PyThreadState *tstate)

static void
init_threadstate(PyThreadState *tstate,
PyInterpreterState *interp, uint64_t id)
PyInterpreterState *interp, uint64_t id, int whence)
{
if (tstate->_status.initialized) {
Py_FatalError("thread state already initialized");
Expand All @@ -1366,6 +1366,10 @@ init_threadstate(PyThreadState *tstate,
assert(tstate->next == NULL);
assert(tstate->prev == NULL);

assert(tstate->_whence == _PyThreadState_WHENCE_NOTSET);
assert(whence >= 0 && whence <= _PyThreadState_WHENCE_GILSTATE);
tstate->_whence = whence;

assert(id > 0);
tstate->id = id;

Expand Down Expand Up @@ -1407,7 +1411,7 @@ add_threadstate(PyInterpreterState *interp, PyThreadState *tstate,
}

static PyThreadState *
new_threadstate(PyInterpreterState *interp)
new_threadstate(PyInterpreterState *interp, int whence)
{
PyThreadState *tstate;
_PyRuntimeState *runtime = interp->runtime;
Expand Down Expand Up @@ -1446,7 +1450,7 @@ new_threadstate(PyInterpreterState *interp)
sizeof(*tstate));
}

init_threadstate(tstate, interp, id);
init_threadstate(tstate, interp, id, whence);
add_threadstate(interp, tstate, old_head);

HEAD_UNLOCK(runtime);
Expand All @@ -1460,7 +1464,8 @@ new_threadstate(PyInterpreterState *interp)
PyThreadState *
PyThreadState_New(PyInterpreterState *interp)
{
PyThreadState *tstate = new_threadstate(interp);
PyThreadState *tstate = new_threadstate(interp,
_PyThreadState_WHENCE_UNKNOWN);
if (tstate) {
bind_tstate(tstate);
// This makes sure there's a gilstate tstate bound
Expand All @@ -1474,16 +1479,16 @@ PyThreadState_New(PyInterpreterState *interp)

// This must be followed by a call to _PyThreadState_Bind();
PyThreadState *
_PyThreadState_New(PyInterpreterState *interp)
_PyThreadState_New(PyInterpreterState *interp, int whence)
{
return new_threadstate(interp);
return new_threadstate(interp, whence);
}

// We keep this for stable ABI compabibility.
PyAPI_FUNC(PyThreadState*)
_PyThreadState_Prealloc(PyInterpreterState *interp)
{
return _PyThreadState_New(interp);
return _PyThreadState_New(interp, _PyThreadState_WHENCE_UNKNOWN);
}

// We keep this around for (accidental) stable ABI compatibility.
Expand Down Expand Up @@ -2240,7 +2245,9 @@ PyGILState_Ensure(void)
int has_gil;
if (tcur == NULL) {
/* Create a new Python thread state for this thread */
tcur = new_threadstate(runtime->gilstate.autoInterpreterState);
// XXX Use PyInterpreterState_EnsureThreadState()?
tcur = new_threadstate(runtime->gilstate.autoInterpreterState,
_PyThreadState_WHENCE_GILSTATE);
if (tcur == NULL) {
Py_FatalError("Couldn't create thread-state for new thread");
}
Expand Down
0