diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-01-11 17:13:55 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-01-11 17:13:55 (GMT) |
| commit | a4a37fefb645316c2694f9ef50fa3bbddb41d0ba (patch) | |
| tree | e2ae87b245f8b6795f64df1797966d6731af419b | |
| parent | c7d484de9bf61ce38cbbe5a071871100cc04c6d4 (diff) | |
| download | cpython-a4a37fefb645316c2694f9ef50fa3bbddb41d0ba.zip cpython-a4a37fefb645316c2694f9ef50fa3bbddb41d0ba.tar.gz cpython-a4a37fefb645316c2694f9ef50fa3bbddb41d0ba.tar.bz2 | |
Merged revisions 68381 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68381 | martin.v.loewis | 2009-01-07 12:40:40 -0600 (Wed, 07 Jan 2009) | 2 lines
Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t.
........
| -rw-r--r-- | Objects/bytesobject.c | 2 | ||||
| -rw-r--r-- | Objects/object.c | 21 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 4 |
3 files changed, 16 insertions, 11 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index b28a554..f9569a7 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -26,7 +26,7 @@ _getbuffer(PyObject *obj, Py_buffer *view) } #ifdef COUNT_ALLOCS -int null_strings, one_strings; +Py_ssize_t null_strings, one_strings; #endif static PyBytesObject *characters[UCHAR_MAX + 1]; diff --git a/Objects/object.c b/Objects/object.c index bf0e6d1..15d26a7 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -81,24 +81,29 @@ static PyTypeObject *type_list; garbage itself. If unlist_types_without_objects is set, they will be removed from the type_list once the last object is deallocated. */ -int unlist_types_without_objects; -extern int tuple_zero_allocs, fast_tuple_allocs; -extern int quick_int_allocs, quick_neg_int_allocs; -extern int null_strings, one_strings; +static int unlist_types_without_objects; +extern Py_ssize_t tuple_zero_allocs, fast_tuple_allocs; +extern Py_ssize_t quick_int_allocs, quick_neg_int_allocs; +extern Py_ssize_t null_strings, one_strings; void dump_counts(FILE* f) { PyTypeObject *tp; for (tp = type_list; tp; tp = tp->tp_next) - fprintf(f, "%s alloc'd: %d, freed: %d, max in use: %d\n", + fprintf(f, "%s alloc'd: %" PY_FORMAT_SIZE_T "d, " + "freed: %" PY_FORMAT_SIZE_T "d, " + "max in use: %" PY_FORMAT_SIZE_T "d\n", tp->tp_name, tp->tp_allocs, tp->tp_frees, tp->tp_maxalloc); - fprintf(f, "fast tuple allocs: %d, empty: %d\n", + fprintf(f, "fast tuple allocs: %" PY_FORMAT_SIZE_T "d, " + "empty: %" PY_FORMAT_SIZE_T "d\n", fast_tuple_allocs, tuple_zero_allocs); - fprintf(f, "fast int allocs: pos: %d, neg: %d\n", + fprintf(f, "fast int allocs: pos: %" PY_FORMAT_SIZE_T "d, " + "neg: %" PY_FORMAT_SIZE_T "d\n", quick_int_allocs, quick_neg_int_allocs); - fprintf(f, "null strings: %d, 1-strings: %d\n", + fprintf(f, "null strings: %" PY_FORMAT_SIZE_T "d, " + "1-strings: %" PY_FORMAT_SIZE_T "d\n", null_strings, one_strings); } diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 679ba8f..9da05ee 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -19,8 +19,8 @@ static PyTupleObject *free_list[PyTuple_MAXSAVESIZE]; static int numfree[PyTuple_MAXSAVESIZE]; #endif #ifdef COUNT_ALLOCS -int fast_tuple_allocs; -int tuple_zero_allocs; +Py_ssize_t fast_tuple_allocs; +Py_ssize_t tuple_zero_allocs; #endif PyObject * |