cpython: 1edff836c954 (original) (raw)
Mercurial > cpython
changeset 85112:1edff836c954
Issue #10241: Clear extension module dict copies at interpreter shutdown. Patch by Neil Schemenauer, minimally modified. (re-apply after fix for tkinter-related crash) [#10241]
| Antoine Pitrou solipsis@pitrou.net | |
|---|---|
| date | Sun, 11 Aug 2013 00:30:09 +0200 |
| parents | 4d0c938870bc |
| children | 3fd62c312f1a |
| files | Include/pystate.h Misc/NEWS Python/import.c Python/pystate.c |
| diffstat | 4 files changed, 33 insertions(+), 0 deletions(-)[+] [-] Include/pystate.h 3 Misc/NEWS 3 Python/import.c 2 Python/pystate.c 25 |
line wrap: on
line diff
--- a/Include/pystate.h +++ b/Include/pystate.h @@ -134,6 +134,9 @@ PyAPI_FUNC(int) PyState_AddModule(PyObje PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*); #endif PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*); +#ifndef Py_LIMITED_API +PyAPI_FUNC(void) _PyState_ClearModules(void); +#endif PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,9 @@ Core and Builtins
- Issue #17899: Fix rare file descriptor leak in os.listdir(). +- Issue #10241: Clear extension module dict copies at interpreter shutdown.
- Issue #9035: ismount now recognises volumes mounted below a drive root on Windows. Original patch by Atsuo Ishimoto.
--- a/Python/import.c +++ b/Python/import.c @@ -380,6 +380,8 @@ PyImport_Cleanup(void) builtins = interp->builtins; interp->builtins = PyDict_New(); Py_DECREF(builtins);
- /* Clear module dict copies stored in the interpreter state */
- _PyState_ClearModules(); /* Collect references / _PyGC_CollectNoFail(); / Dump GC stats before it's too late, since it uses the warnings
--- a/Python/pystate.c +++ b/Python/pystate.c @@ -320,6 +320,31 @@ PyState_RemoveModule(struct PyModuleDef* return PyList_SetItem(state->modules_by_index, index, Py_None); } +/* used by import.c:PyImport_Cleanup */ +void +_PyState_ClearModules(void) +{
- PyInterpreterState *state = PyThreadState_GET()->interp;
- if (state->modules_by_index) {
Py_ssize_t i;[](#l4.13)for (i = 0; i < PyList_GET_SIZE(state->modules_by_index); i++) {[](#l4.14)PyObject *m = PyList_GET_ITEM(state->modules_by_index, i);[](#l4.15)if (PyModule_Check(m)) {[](#l4.16)/* cleanup the saved copy of module dicts */[](#l4.17)PyModuleDef *md = PyModule_GetDef(m);[](#l4.18)if (md)[](#l4.19)Py_CLEAR(md->m_base.m_copy);[](#l4.20)}[](#l4.21)}[](#l4.22)/* Setting modules_by_index to NULL could be dangerous, so we[](#l4.23)clear the list instead. */[](#l4.24)if (PyList_SetSlice(state->modules_by_index,[](#l4.25)0, PyList_GET_SIZE(state->modules_by_index),[](#l4.26)NULL))[](#l4.27)PyErr_WriteUnraisable(state->modules_by_index);[](#l4.28)- }