summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-03-23 19:19:54 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-03-23 19:19:54 (GMT)
commitacc5d6b195c9f9819cc7ccab71547fde3f21ab3f (patch)
treed5bd2988930e87798aae30245e754486e1821312 /Objects
parent3a652b1d0af20c7d2a9fc9251f71b2a34c49b302 (diff)
downloadcpython-acc5d6b195c9f9819cc7ccab71547fde3f21ab3f.zip
cpython-acc5d6b195c9f9819cc7ccab71547fde3f21ab3f.tar.gz
cpython-acc5d6b195c9f9819cc7ccab71547fde3f21ab3f.tar.bz2
Merged revisions 70550 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70550 | antoine.pitrou | 2009-03-23 20:17:00 +0100 (lun., 23 mars 2009) | 3 lines The tracking statistics were actually too pessimistic ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/dictobject.c1
-rw-r--r--Objects/tupleobject.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index e005f8e..b39c614 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -500,6 +500,7 @@ _PyDict_MaybeUntrack(PyObject *op)
_PyObject_GC_MAY_BE_TRACKED(ep[i].me_key))
return;
}
+ DECREASE_TRACK_COUNT
_PyObject_GC_UNTRACK(op);
}
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 11be0e1..290107a 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -50,9 +50,6 @@ PyTuple_New(register Py_ssize_t size)
{
register PyTupleObject *op;
Py_ssize_t i;
-#ifdef SHOW_TRACK_COUNT
- count_tracked++;
-#endif
if (size < 0) {
PyErr_BadInternalCall();
return NULL;
@@ -104,6 +101,9 @@ PyTuple_New(register Py_ssize_t size)
Py_INCREF(op); /* extra INCREF so that this is never freed */
}
#endif
+#ifdef SHOW_TRACK_COUNT
+ count_tracked++;
+#endif
_PyObject_GC_TRACK(op);
return (PyObject *) op;
}