mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

refactor __del__ exception handler into PyErr_WriteUnraisable

Browse source 
add sanity check to gc: if an exception occurs during GC, call
PyErr_WriteUnraisable and then call Py_FatalEror.
This commit is contained in:
Jeremy Hylton 2000-09-01 02:47:25 +00:00
parent b9ce5ada37
commit b709df3810
5 changed files with 50 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/gcmodule.c
View file

@ -57,11 +57,13 @@ static int allocated;
DEBUG_UNCOLLECTABLE | \
DEBUG_INSTANCES | \
DEBUG_OBJECTS
static int debug = 0;
static int debug;
/* list of uncollectable objects */
static PyObject *garbage;
/* Python string to use if unhandled exception occurs */
static PyObject *gc_str;
/*** list functions ***/
@ -435,6 +437,10 @@ collect(PyGC_Head *young, PyGC_Head *old)
* this if they insist on creating this type of structure. */
handle_finalizers(&finalizers, old);
if (PyErr_Occurred()) {
PyErr_WriteUnraisable(gc_str);
Py_FatalError("unexpected exception during garbage collection");
}
allocated = 0;
return n+m;
}
@ -699,6 +705,9 @@ initgc(void)
if (garbage == NULL) {
garbage = PyList_New(0);
}
if (gc_str == NULL) {
gc_str = PyString_FromString("garbage collection");
}
PyDict_SetItemString(d, "garbage", garbage);
PyDict_SetItemString(d, "DEBUG_STATS",
PyInt_FromLong(DEBUG_STATS));