Refactored some of the Py_TRACE_REFS code. New private API function
_Py_AddToAllObjects() that simply inserts an object at the front of
the doubly-linked list of all objects. Changed PyType_Ready() (the
closest thing we've got to a choke point for type objects) to call
that.
diff --git a/Objects/object.c b/Objects/object.c
index ecc25c7..059b36a 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -20,6 +20,16 @@
#ifdef Py_TRACE_REFS
/* Head of doubly-linked list of all objects. */
static PyObject refchain = {&refchain, &refchain};
+
+/* Insert op at the fron of the doubly-linked list of all objects. */
+void
+_Py_AddToAllObjects(PyObject *op)
+{
+ op->_ob_next = refchain._ob_next;
+ op->_ob_prev = &refchain;
+ refchain._ob_next->_ob_prev = op;
+ refchain._ob_next = op;
+}
#endif
#ifdef COUNT_ALLOCS
@@ -91,12 +101,9 @@
type_list = tp;
#ifdef Py_TRACE_REFS
/* Also insert in the doubly-linked list of all objects. */
- if (tp->_ob_next == NULL) {
- PyObject *op = (PyObject *)tp;
- op->_ob_next = refchain._ob_next;
- op->_ob_prev = &refchain;
- refchain._ob_next->_ob_prev = op;
- refchain._ob_next = op;
+ if (tp->_ob_prev == NULL) {
+ assert(tp->_ob_next == NULL);
+ _Py_AddToAllObjects((PyObject *)tp);
}
#endif
}
@@ -1956,10 +1963,7 @@
{
_Py_INC_REFTOTAL;
op->ob_refcnt = 1;
- op->_ob_next = refchain._ob_next;
- op->_ob_prev = &refchain;
- refchain._ob_next->_ob_prev = op;
- refchain._ob_next = op;
+ _Py_AddToAllObjects(op);
_Py_INC_TPALLOCS(op);
}