mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Leak pluggin', bug fixin' and better documentin'. Specifically,

Browse source 
module__doc__: Document the Warning subclass heirarchy.

make_class(): Added a "goto finally" so that if populate_methods()
fails, the return status will be -1 (failure) instead of 0 (success).

fini_exceptions(): When decref'ing the static pointers to the
exception classes, clear out their dictionaries too.  This breaks a
cycle from class->dict->method->class and allows the classes with
unbound methods to be reclaimed.  This plugs a large memory leak in a
common Py_Initialize()/dosomething/Py_Finalize() loop.
This commit is contained in:
Barry Warsaw 2001-01-23 16:08:34 +00:00
parent 5bb3be2ffe
commit 9667ed23c5
1 changed files with 72 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

102
Python/exceptions.c
View file

@ -53,51 +53,58 @@ Exception\n\
|\n\ |\n\
+-- SystemExit\n\ +-- SystemExit\n\
+-- StandardError\n\ +-- StandardError\n\
| |\n\
| +-- KeyboardInterrupt\n\
| +-- ImportError\n\
| +-- EnvironmentError\n\
| | |\n\
| | +-- IOError\n\
| | +-- OSError\n\
| | |\n\
| | +-- WindowsError\n\
| |\n\
| +-- EOFError\n\
| +-- RuntimeError\n\
| | |\n\
| | +-- NotImplementedError\n\
| |\n\
| +-- NameError\n\
| | |\n\
| | +-- UnboundLocalError\n\
| |\n\
| +-- AttributeError\n\
| +-- SyntaxError\n\
| | |\n\
| | +-- IndentationError\n\
| | |\n\
| | +-- TabError\n\
| |\n\
| +-- TypeError\n\
| +-- AssertionError\n\
| +-- LookupError\n\
| | |\n\
| | +-- IndexError\n\
| | +-- KeyError\n\
| |\n\
| +-- ArithmeticError\n\
| | |\n\
| | +-- OverflowError\n\
| | +-- ZeroDivisionError\n\
| | +-- FloatingPointError\n\
| |\n\
| +-- ValueError\n\
| | |\n\
| | +-- UnicodeError\n\
| |\n\
| +-- SystemError\n\
| +-- MemoryError\n\
|\n\ |\n\
+-- KeyboardInterrupt\n\ +---Warning\n\
+-- ImportError\n\
+-- EnvironmentError\n\
| |\n\
| +-- IOError\n\
| +-- OSError\n\
| |\n\
| +-- WindowsError\n\
|\n\ |\n\
+-- EOFError\n\ +-- UserWarning\n\
+-- RuntimeError\n\ +-- DeprecationWarning\n\
| |\n\ +-- SyntaxWarning\n\
| +-- NotImplementedError\n\ +-- RuntimeWarning";
|\n\
+-- NameError\n\
| |\n\
| +-- UnboundLocalError\n\
|\n\
+-- AttributeError\n\
+-- SyntaxError\n\
| |\n\
| +-- IndentationError\n\
| |\n\
| +-- TabError\n\
|\n\
+-- TypeError\n\
+-- AssertionError\n\
+-- LookupError\n\
| |\n\
| +-- IndexError\n\
| +-- KeyError\n\
|\n\
+-- ArithmeticError\n\
| |\n\
| +-- OverflowError\n\
| +-- ZeroDivisionError\n\
| +-- FloatingPointError\n\
|\n\
+-- ValueError\n\
| |\n\
| +-- UnicodeError\n\
|\n\
+-- SystemError\n\
+-- MemoryError";
/* Helper function for populating a dictionary with method wrappers. */ /* Helper function for populating a dictionary with method wrappers. */
@ -168,6 +175,7 @@ make_class(PyObject **klass, PyObject *base,
if (populate_methods(*klass, dict, methods)) { if (populate_methods(*klass, dict, methods)) {
Py_DECREF(*klass); Py_DECREF(*klass);
*klass = NULL; *klass = NULL;
goto finally;
} }
status = 0; status = 0;
@ -1132,6 +1140,14 @@ fini_exceptions(void)
PyExc_MemoryErrorInst = NULL; PyExc_MemoryErrorInst = NULL;
for (i=0; exctable[i].name; i++) { for (i=0; exctable[i].name; i++) {
/* clear the class's dictionary, freeing up circular references
* between the class and its methods.
*/
PyObject* cdict = PyObject_GetAttrString(*exctable[i].exc, "__dict__");
PyDict_Clear(cdict);
Py_DECREF(cdict);
/* Now decref the exception class */
Py_XDECREF(*exctable[i].exc); Py_XDECREF(*exctable[i].exc);
*exctable[i].exc = NULL; *exctable[i].exc = NULL;
} }