From 883cbeedcaf0a3343f1b7691cf57e28802c8d5eb Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Tue, 3 Dec 2019 21:58:46 +0000 Subject: [PATCH 1/2] bpo-38962: Fix reference leak in the per-subinterpreter gc --- Python/pylifecycle.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 9218978cc6fa7d..d383f00449a3e9 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1253,17 +1253,20 @@ finalize_interp_clear(PyThreadState *tstate) { int is_main_interp = _Py_IsMainInterpreter(tstate); - /* bpo-36854: Explicitly clear the codec registry - and trigger a GC collection */ + /* bpo-36854: Explicitly clear the codec registry */ 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 */ PyInterpreterState_Clear(tstate->interp); + /* Trigger a GC collection on subinterpreters*/ + if (!is_main_interp) { + _PyGC_CollectNoFail(); + } + finalize_interp_types(tstate, is_main_interp); if (is_main_interp) { From 487863c26f8394505dcc3d4fec086885afb98a80 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Wed, 4 Dec 2019 11:27:04 +0000 Subject: [PATCH 2/2] fixup! bpo-38962: Fix reference leak in the per-subinterpreter gc --- Python/pylifecycle.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index d383f00449a3e9..d6f65ec3caf66e 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1253,11 +1253,7 @@ finalize_interp_clear(PyThreadState *tstate) { int is_main_interp = _Py_IsMainInterpreter(tstate); - /* bpo-36854: Explicitly clear the codec registry */ PyInterpreterState *interp = tstate->interp; - Py_CLEAR(interp->codec_search_path); - Py_CLEAR(interp->codec_search_cache); - Py_CLEAR(interp->codec_error_registry); /* Clear interpreter state and all thread states */ PyInterpreterState_Clear(tstate->interp);