traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38962: Fix reference leak in the per-subinterpreter gc (GH-17457) 

https://bugs.python.org/issue38962



Automerge-Triggered-By: @pablogsal
This commit is contained in:
Pablo Galindo 2019-12-04 11:51:03 +00:00 committed by Miss Islington (bot)
parent b96c6b0723
commit ac0e1c2694
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Python/pylifecycle.c
View File

@ -1253,17 +1253,16 @@ finalize_interp_clear(PyThreadState *tstate)
{ {
int is_main_interp = _Py_IsMainInterpreter(tstate); int is_main_interp = _Py_IsMainInterpreter(tstate);
/* bpo-36854: Explicitly clear the codec registry
and trigger a GC collection */
PyInterpreterState *interp = tstate->interp; PyInterpreterState *interp = tstate->interp;
Py_CLEAR(interp->codec_search_path);
Py_CLEAR(interp->codec_search_cache);
Py_CLEAR(interp->codec_error_registry);
_PyGC_CollectNoFail();
/* Clear interpreter state and all thread states */ /* Clear interpreter state and all thread states */
PyInterpreterState_Clear(tstate->interp); PyInterpreterState_Clear(tstate->interp);
/* Trigger a GC collection on subinterpreters*/
if (!is_main_interp) {
_PyGC_CollectNoFail();
}
finalize_interp_types(tstate, is_main_interp); finalize_interp_types(tstate, is_main_interp);
if (is_main_interp) { if (is_main_interp) {