diff options
author | Victor Stinner <vstinner@python.org> | 2020-05-19 22:27:46 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-19 22:27:46 (GMT) |
commit | 9512ad74b0fcaff023c1ade75313dc8e249aef78 (patch) | |
tree | d8a0949f5e3cea7910a33b8ec7d723804e21d8dd /Modules | |
parent | b008445a7b93c8c5d4773d33277c6fe815afca7b (diff) | |
download | cpython-9512ad74b0fcaff023c1ade75313dc8e249aef78.zip cpython-9512ad74b0fcaff023c1ade75313dc8e249aef78.tar.gz cpython-9512ad74b0fcaff023c1ade75313dc8e249aef78.tar.bz2 |
[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.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_xxsubinterpretersmodule.c | 15 | ||||
-rw-r--r-- | Modules/gcmodule.c | 8 |
2 files changed, 0 insertions, 23 deletions
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c index 8a6fce9..de11c09 100644 --- a/Modules/_xxsubinterpretersmodule.c +++ b/Modules/_xxsubinterpretersmodule.c @@ -1939,20 +1939,6 @@ _run_script_in_interpreter(PyInterpreterState *interp, const char *codestr, return -1; } -#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS - // Switch to interpreter. - PyThreadState *new_tstate = PyInterpreterState_ThreadHead(interp); - PyThreadState *save1 = PyEval_SaveThread(); - - (void)PyThreadState_Swap(new_tstate); - - // Run the script. - _sharedexception *exc = NULL; - int result = _run_script(interp, codestr, shared, &exc); - - // Switch back. - PyEval_RestoreThread(save1); -#else // Switch to interpreter. PyThreadState *save_tstate = NULL; if (interp != PyInterpreterState_Get()) { @@ -1970,7 +1956,6 @@ _run_script_in_interpreter(PyInterpreterState *interp, const char *codestr, if (save_tstate != NULL) { PyThreadState_Swap(save_tstate); } -#endif // Propagate any exception out to the caller. if (exc != NULL) { diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index a44752b..56dcb10 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -1181,14 +1181,6 @@ collect(PyThreadState *tstate, int generation, _PyTime_t t1 = 0; /* initialize to prevent a compiler warning */ GCState *gcstate = &tstate->interp->gc; -#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS - if (tstate->interp->config._isolated_interpreter) { - // bpo-40533: The garbage collector must not be run on parallel on - // Python objects shared by multiple interpreters. - return 0; - } -#endif - if (gcstate->debug & DEBUG_STATS) { PySys_WriteStderr("gc: collecting generation %d...\n", generation); show_stats_each_generations(gcstate); |