Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5463/python/dist/src/Objects
Modified Files:
classobject.c
Log Message:
Fix for SF bug 110688: Instance deallocation neglected to account for
that Py_INCREF boosts global _Py_RefTotal when Py_REF_DEBUG is defined
but Py_TRACE_REFS isn't.
There are, IMO, way too many preprocessor gimmicks in use for refcount
debugging (at least 3 distinct true/false symbols, but not all 8 combos
are supported by the code, etc etc), and no coherent documentation of
this stuff -- 'twas too painful to track this one down.
Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.109
retrieving revision 2.110
diff -C2 -r2.109 -r2.110
*** classobject.c 2000/09/15 18:57:21 2.109
--- classobject.c 2000/09/17 14:40:17 2.110
***************
*** 488,522 ****
PyObject *del;
static PyObject *delstr;
! #ifdef Py_TRACE_REFS
extern long _Py_RefTotal;
#endif
! /* Call the __del__ method if it exists. First temporarily
! revive the object and save the current exception, if any. */
#ifdef Py_TRACE_REFS
/* much too complicated if Py_TRACE_REFS defined */
inst->ob_type = &PyInstance_Type;
_Py_NewReference((PyObject *)inst);
- _Py_RefTotal--; /* compensate for increment in NEWREF */
#ifdef COUNT_ALLOCS
! inst->ob_type->tp_alloc--; /* ditto */
#endif
#else /* !Py_TRACE_REFS */
Py_INCREF(inst);
#endif /* !Py_TRACE_REFS */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
if (delstr == NULL)
delstr = PyString_InternFromString("__del__");
if ((del = instance_getattr2(inst, delstr)) != NULL) {
PyObject *res = PyEval_CallObject(del, (PyObject *)NULL);
! if (res == NULL) {
PyErr_WriteUnraisable(del);
- }
else
Py_DECREF(res);
Py_DECREF(del);
}
! /* Restore the saved exception and undo the temporary revival */
PyErr_Restore(error_type, error_value, error_traceback);
! /* Can't use DECREF here, it would cause a recursive call */
if (--inst->ob_refcnt > 0) {
#ifdef COUNT_ALLOCS
--- 488,537 ----
PyObject *del;
static PyObject *delstr;
! #ifdef Py_REF_DEBUG
extern long _Py_RefTotal;
#endif
! /* Temporarily resurrect the object. */
#ifdef Py_TRACE_REFS
+ #ifndef Py_REF_DEBUG
+ # error "Py_TRACE_REFS defined but Py_REF_DEBUG not."
+ #endif
/* much too complicated if Py_TRACE_REFS defined */
inst->ob_type = &PyInstance_Type;
_Py_NewReference((PyObject *)inst);
#ifdef COUNT_ALLOCS
! /* compensate for boost in _Py_NewReference; note that
! * _Py_RefTotal was also boosted; we'll knock that down later.
! */
! inst->ob_type->tp_alloc--;
#endif
#else /* !Py_TRACE_REFS */
+ /* Py_INCREF boosts _Py_RefTotal if Py_REF_DEBUG is defined */
Py_INCREF(inst);
#endif /* !Py_TRACE_REFS */
+
+ /* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
+ /* Execute __del__ method, if any. */
if (delstr == NULL)
delstr = PyString_InternFromString("__del__");
if ((del = instance_getattr2(inst, delstr)) != NULL) {
PyObject *res = PyEval_CallObject(del, (PyObject *)NULL);
! if (res == NULL)
PyErr_WriteUnraisable(del);
else
Py_DECREF(res);
Py_DECREF(del);
}
! /* Restore the saved exception. */
PyErr_Restore(error_type, error_value, error_traceback);
! /* Undo the temporary resurrection; can't use DECREF here, it would
! * cause a recursive call.
! */
! #ifdef Py_REF_DEBUG
! /* _Py_RefTotal was boosted either by _Py_NewReference or
! * Py_INCREF above.
! */
! _Py_RefTotal--;
! #endif
if (--inst->ob_refcnt > 0) {
#ifdef COUNT_ALLOCS
***************
*** 526,537 ****
}
#ifdef Py_TRACE_REFS
#ifdef COUNT_ALLOCS
! inst->ob_type->tp_free--; /* compensate for increment in UNREF */
#endif
- _Py_ForgetReference((PyObject *)inst);
#ifndef WITH_CYCLE_GC
inst->ob_type = NULL;
#endif
- #endif /* Py_TRACE_REFS */
PyObject_GC_Fini(inst);
Py_DECREF(inst->in_class);
--- 541,553 ----
}
#ifdef Py_TRACE_REFS
+ _Py_ForgetReference((PyObject *)inst);
#ifdef COUNT_ALLOCS
! /* compensate for increment in _Py_ForgetReference */
! inst->ob_type->tp_free--;
#endif
#ifndef WITH_CYCLE_GC
inst->ob_type = NULL;
+ #endif
#endif
PyObject_GC_Fini(inst);
Py_DECREF(inst->in_class);
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4