mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
[3.9] bpo-40514: Remove --with-experimental-isolated-subinterpreters in 3.9 (GH-20228)
Remove --with-experimental-isolated-subinterpreters configure option in Python 3.9: the experiment continues in the master branch, but it's no longer needed in 3.9.
This commit is contained in:
Victor Stinner
GitHub
parent
b008445a7b
commit
9512ad74b0
21 changed files with 7 additions and 236 deletions
|
|
@ -250,21 +250,6 @@ ensure_tstate_not_null(const char *func, PyThreadState *tstate)
|
|||
}
|
||||
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
int
|
||||
_PyEval_ThreadsInitialized(PyInterpreterState *interp)
|
||||
{
|
||||
return gil_created(&interp->ceval.gil);
|
||||
}
|
||||
|
||||
int
|
||||
PyEval_ThreadsInitialized(void)
|
||||
{
|
||||
// Fatal error if there is no current interpreter
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
return _PyEval_ThreadsInitialized(interp);
|
||||
}
|
||||
#else
|
||||
int
|
||||
_PyEval_ThreadsInitialized(_PyRuntimeState *runtime)
|
||||
{
|
||||
|
|
@ -277,25 +262,18 @@ PyEval_ThreadsInitialized(void)
|
|||
_PyRuntimeState *runtime = &_PyRuntime;
|
||||
return _PyEval_ThreadsInitialized(runtime);
|
||||
}
|
||||
#endif
|
||||
|
||||
PyStatus
|
||||
_PyEval_InitGIL(PyThreadState *tstate)
|
||||
{
|
||||
#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
if (!_Py_IsMainInterpreter(tstate)) {
|
||||
/* Currently, the GIL is shared by all interpreters,
|
||||
and only the main interpreter is responsible to create
|
||||
and destroy it. */
|
||||
return _PyStatus_OK();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
struct _gil_runtime_state *gil = &tstate->interp->ceval.gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &tstate->interp->runtime->ceval.gil;
|
||||
#endif
|
||||
assert(!gil_created(gil));
|
||||
|
||||
PyThread_init_thread();
|
||||
|
|
@ -310,20 +288,14 @@ _PyEval_InitGIL(PyThreadState *tstate)
|
|||
void
|
||||
_PyEval_FiniGIL(PyThreadState *tstate)
|
||||
{
|
||||
#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
if (!_Py_IsMainInterpreter(tstate)) {
|
||||
/* Currently, the GIL is shared by all interpreters,
|
||||
and only the main interpreter is responsible to create
|
||||
and destroy it. */
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
struct _gil_runtime_state *gil = &tstate->interp->ceval.gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &tstate->interp->runtime->ceval.gil;
|
||||
#endif
|
||||
if (!gil_created(gil)) {
|
||||
/* First Py_InitializeFromConfig() call: the GIL doesn't exist
|
||||
yet: do nothing. */
|
||||
|
|
@ -408,13 +380,9 @@ PyEval_AcquireThread(PyThreadState *tstate)
|
|||
take_gil(tstate);
|
||||
|
||||
struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
(void)_PyThreadState_Swap(gilstate, tstate);
|
||||
#else
|
||||
if (_PyThreadState_Swap(gilstate, tstate) != NULL) {
|
||||
Py_FatalError("non-NULL old thread state");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -444,11 +412,7 @@ _PyEval_ReInitThreads(_PyRuntimeState *runtime)
|
|||
PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
|
||||
ensure_tstate_not_null(__func__, tstate);
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
struct _gil_runtime_state *gil = &tstate->interp->ceval.gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &runtime->ceval.gil;
|
||||
#endif
|
||||
if (!gil_created(gil)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -480,21 +444,12 @@ PyThreadState *
|
|||
PyEval_SaveThread(void)
|
||||
{
|
||||
_PyRuntimeState *runtime = &_PyRuntime;
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyThreadState *old_tstate = _PyThreadState_GET();
|
||||
PyThreadState *tstate = _PyThreadState_Swap(&runtime->gilstate, old_tstate);
|
||||
#else
|
||||
PyThreadState *tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);
|
||||
#endif
|
||||
ensure_tstate_not_null(__func__, tstate);
|
||||
|
||||
struct _ceval_runtime_state *ceval = &runtime->ceval;
|
||||
struct _ceval_state *ceval2 = &tstate->interp->ceval;
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
assert(gil_created(&ceval2->gil));
|
||||
#else
|
||||
assert(gil_created(&ceval->gil));
|
||||
#endif
|
||||
drop_gil(ceval, ceval2, tstate);
|
||||
return tstate;
|
||||
}
|
||||
|
|
@ -753,9 +708,7 @@ void
|
|||
_PyEval_InitRuntimeState(struct _ceval_runtime_state *ceval)
|
||||
{
|
||||
_Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
|
||||
#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
_gil_initialize(&ceval->gil);
|
||||
#endif
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -771,10 +724,6 @@ _PyEval_InitState(struct _ceval_state *ceval)
|
|||
return -1;
|
||||
}
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
_gil_initialize(&ceval->gil);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -919,13 +868,9 @@ eval_frame_handle_pending(PyThreadState *tstate)
|
|||
|
||||
take_gil(tstate);
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
(void)_PyThreadState_Swap(&runtime->gilstate, tstate);
|
||||
#else
|
||||
if (_PyThreadState_Swap(&runtime->gilstate, tstate) != NULL) {
|
||||
Py_FatalError("orphan tstate");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Check for asynchronous exception. */
|
||||
|
|
|
|||
|
|
@ -144,11 +144,7 @@ static void
|
|||
drop_gil(struct _ceval_runtime_state *ceval, struct _ceval_state *ceval2,
|
||||
PyThreadState *tstate)
|
||||
{
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
struct _gil_runtime_state *gil = &ceval2->gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &ceval->gil;
|
||||
#endif
|
||||
if (!_Py_atomic_load_relaxed(&gil->locked)) {
|
||||
Py_FatalError("drop_gil: GIL is not locked");
|
||||
}
|
||||
|
|
@ -232,11 +228,7 @@ take_gil(PyThreadState *tstate)
|
|||
PyInterpreterState *interp = tstate->interp;
|
||||
struct _ceval_runtime_state *ceval = &interp->runtime->ceval;
|
||||
struct _ceval_state *ceval2 = &interp->ceval;
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
struct _gil_runtime_state *gil = &ceval2->gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &ceval->gil;
|
||||
#endif
|
||||
|
||||
/* Check that _PyEval_InitThreads() was called to create the lock */
|
||||
assert(gil_created(gil));
|
||||
|
|
@ -328,22 +320,12 @@ _ready:
|
|||
|
||||
void _PyEval_SetSwitchInterval(unsigned long microseconds)
|
||||
{
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
struct _gil_runtime_state *gil = &interp->ceval.gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &_PyRuntime.ceval.gil;
|
||||
#endif
|
||||
gil->interval = microseconds;
|
||||
}
|
||||
|
||||
unsigned long _PyEval_GetSwitchInterval()
|
||||
{
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
struct _gil_runtime_state *gil = &interp->ceval.gil;
|
||||
#else
|
||||
struct _gil_runtime_state *gil = &_PyRuntime.ceval.gil;
|
||||
#endif
|
||||
return gil->interval;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,17 +291,7 @@ _PyPreConfig_InitCompatConfig(PyPreConfig *config)
|
|||
config->coerce_c_locale_warn = 0;
|
||||
|
||||
config->dev_mode = -1;
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
/* bpo-40512: pymalloc is not compatible with subinterpreters,
|
||||
force usage of libc malloc() which is thread-safe. */
|
||||
#ifdef Py_DEBUG
|
||||
config->allocator = PYMEM_ALLOCATOR_MALLOC_DEBUG;
|
||||
#else
|
||||
config->allocator = PYMEM_ALLOCATOR_MALLOC;
|
||||
#endif
|
||||
#else
|
||||
config->allocator = PYMEM_ALLOCATOR_NOT_SET;
|
||||
#endif
|
||||
#ifdef MS_WINDOWS
|
||||
config->legacy_windows_fs_encoding = -1;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1561,12 +1561,10 @@ new_interpreter(PyThreadState **tstate_p, int isolated_subinterpreter)
|
|||
|
||||
/* Copy the current interpreter config into the new interpreter */
|
||||
const PyConfig *config;
|
||||
#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
if (save_tstate != NULL) {
|
||||
config = _PyInterpreterState_GetConfig(save_tstate->interp);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
/* No current thread state, copy from the main interpreter */
|
||||
PyInterpreterState *main_interp = PyInterpreterState_Main();
|
||||
|
|
|
|||
|
|
@ -956,14 +956,6 @@ _PyThreadState_DeleteExcept(_PyRuntimeState *runtime, PyThreadState *tstate)
|
|||
}
|
||||
|
||||
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyThreadState*
|
||||
_PyThreadState_GetTSS(void) {
|
||||
return PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
PyThreadState *
|
||||
_PyThreadState_UncheckedGet(void)
|
||||
{
|
||||
|
|
@ -983,11 +975,7 @@ PyThreadState_Get(void)
|
|||
PyThreadState *
|
||||
_PyThreadState_Swap(struct _gilstate_runtime_state *gilstate, PyThreadState *newts)
|
||||
{
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyThreadState *oldts = _PyThreadState_GetTSS();
|
||||
#else
|
||||
PyThreadState *oldts = _PyRuntimeGILState_GetThreadState(gilstate);
|
||||
#endif
|
||||
|
||||
_PyRuntimeGILState_SetThreadState(gilstate, newts);
|
||||
/* It should not be possible for more than one thread state
|
||||
|
|
@ -1005,9 +993,6 @@ _PyThreadState_Swap(struct _gilstate_runtime_state *gilstate, PyThreadState *new
|
|||
Py_FatalError("Invalid thread state for this thread");
|
||||
errno = err;
|
||||
}
|
||||
#endif
|
||||
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
PyThread_tss_set(&gilstate->autoTSSkey, newts);
|
||||
#endif
|
||||
return oldts;
|
||||
}
|
||||
|
|
@ -1378,9 +1363,7 @@ PyGILState_Ensure(void)
|
|||
|
||||
/* Ensure that _PyEval_InitThreads() and _PyGILState_Init() have been
|
||||
called by Py_Initialize() */
|
||||
#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
|
||||
assert(_PyEval_ThreadsInitialized(runtime));
|
||||
#endif
|
||||
assert(gilstate->autoInterpreterState);
|
||||
|
||||
PyThreadState *tcur = (PyThreadState *)PyThread_tss_get(&gilstate->autoTSSkey);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue