Skip to content

Commit

Permalink
GH-99205: remove _static field from PyThreadState and `PyInterpre…
Browse files Browse the repository at this point in the history
…terState` (GH-99385)
  • Loading branch information
kumaraditya303 authored Nov 15, 2022
1 parent e874c2f commit dc3e435
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
3 changes: 0 additions & 3 deletions Include/cpython/pystate.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ struct _ts {
after allocation. */
int _initialized;

/* Was this thread state statically allocated? */
int _static;

int py_recursion_remaining;
int py_recursion_limit;

Expand Down
3 changes: 0 additions & 3 deletions Include/internal/pycore_interp.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ struct _is {
int _initialized;
int finalizing;

/* Was this interpreter statically allocated? */
bool _static;

struct _ceval_state ceval;
struct _gc_runtime_state gc;

Expand Down
2 changes: 0 additions & 2 deletions Include/internal/pycore_runtime_init.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ extern "C" {

#define _PyInterpreterState_INIT \
{ \
._static = 1, \
.id_refcount = -1, \
DLOPENFLAGS_INIT \
.ceval = { \
Expand All @@ -108,7 +107,6 @@ extern "C" {

#define _PyThreadState_INIT \
{ \
._static = 1, \
.py_recursion_limit = Py_DEFAULT_RECURSION_LIMIT, \
.context_ver = 1, \
}
Expand Down
16 changes: 6 additions & 10 deletions Python/pystate.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ alloc_interpreter(void)
static void
free_interpreter(PyInterpreterState *interp)
{
if (!interp->_static) {
// The main interpreter is statically allocated so
// should not be freed.
if (interp != &_PyRuntime._main_interpreter) {
PyMem_RawFree(interp);
}
}
Expand Down Expand Up @@ -359,7 +361,6 @@ PyInterpreterState_New(void)
interp = &runtime->_main_interpreter;
assert(interp->id == 0);
assert(interp->next == NULL);
assert(interp->_static);

interpreters->main = interp;
}
Expand All @@ -374,9 +375,6 @@ PyInterpreterState_New(void)
// Set to _PyInterpreterState_INIT.
memcpy(interp, &initial._main_interpreter,
sizeof(*interp));
// We need to adjust any fields that are different from the initial
// interpreter (as defined in _PyInterpreterState_INIT):
interp->_static = false;

if (id < 0) {
/* overflow or Py_Initialize() not called yet! */
Expand Down Expand Up @@ -762,7 +760,9 @@ alloc_threadstate(void)
static void
free_threadstate(PyThreadState *tstate)
{
if (!tstate->_static) {
// The initial thread state of the interpreter is allocated
// as part of the interpreter state so should not be freed.
if (tstate != &tstate->interp->_initial_thread) {
PyMem_RawFree(tstate);
}
}
Expand Down Expand Up @@ -845,7 +845,6 @@ new_threadstate(PyInterpreterState *interp)
assert(id == 1);
used_newtstate = 0;
tstate = &interp->_initial_thread;
assert(tstate->_static);
}
else {
// Every valid interpreter must have at least one thread.
Expand All @@ -857,9 +856,6 @@ new_threadstate(PyInterpreterState *interp)
memcpy(tstate,
&initial._main_interpreter._initial_thread,
sizeof(*tstate));
// We need to adjust any fields that are different from the initial
// thread (as defined in _PyThreadState_INIT):
tstate->_static = false;
}
interp->threads.head = tstate;

Expand Down

0 comments on commit dc3e435

Please sign in to comment.