From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Fedora Python maintainers <python-devel@lists.fedoraproject.org>

Date: Wed, 15 Jul 2020 15:37:52 +0200

Subject: [PATCH] 00147-add-debug-malloc-stats.patch

00147 #

Add a sys._debugmallocstats() function

Based on patch 202 from RHEL 5's python.spec, with updates from rhbz#737198

Sent upstream as http://bugs.python.org/issue14785

---

 Include/dictobject.h    |  2 ++

 Include/floatobject.h   |  1 +

 Include/frameobject.h   |  2 ++

 Include/intobject.h     |  2 ++

 Include/listobject.h    |  2 ++

 Include/methodobject.h  |  4 +++

 Include/object.h        |  7 ++++

 Include/objimpl.h       |  2 +-

 Include/stringobject.h  |  2 ++

 Include/unicodeobject.h |  2 ++

 Lib/test/test_sys.py    | 26 ++++++++++++++

 Objects/classobject.c   |  9 +++++

 Objects/dictobject.c    |  9 +++++

 Objects/floatobject.c   | 16 +++++++++

 Objects/frameobject.c   | 10 ++++++

 Objects/intobject.c     | 17 +++++++++

 Objects/listobject.c    |  9 +++++

 Objects/methodobject.c  |  9 +++++

 Objects/object.c        | 17 +++++++++

 Objects/obmalloc.c      | 80 +++++++++++++++++++++++------------------

 Objects/setobject.c     | 10 ++++++

 Objects/stringobject.c  | 40 +++++++++++++++++++++

 Objects/tupleobject.c   | 16 +++++++++

 Objects/unicodeobject.c |  6 ++++

 Python/pythonrun.c      |  2 +-

 Python/sysmodule.c      | 53 +++++++++++++++++++++++++++

 26 files changed, 319 insertions(+), 36 deletions(-)

diff --git a/Include/dictobject.h b/Include/dictobject.h

index 5a1e9feea13..da89cec6362 100644

--- a/Include/dictobject.h

+++ b/Include/dictobject.h

@@ -154,6 +154,8 @@ PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);

 PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);

 PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);

+PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/floatobject.h b/Include/floatobject.h

index 54e88256a2e..33c6ac0d78f 100644

--- a/Include/floatobject.h

+++ b/Include/floatobject.h

@@ -132,6 +132,7 @@ PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj,

    failure.  Used in builtin_round in bltinmodule.c. */

 PyAPI_FUNC(PyObject *) _Py_double_round(double x, int ndigits);

+PyAPI_FUNC(void) _PyFloat_DebugMallocStats(FILE* out);

 #ifdef __cplusplus

diff --git a/Include/frameobject.h b/Include/frameobject.h

index 34603794c65..db89a4af05b 100644

--- a/Include/frameobject.h

+++ b/Include/frameobject.h

@@ -80,6 +80,8 @@ PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);

 PyAPI_FUNC(int) PyFrame_ClearFreeList(void);

+PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out);

+

 /* Return the line of code the frame is currently executing. */

 PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *);

diff --git a/Include/intobject.h b/Include/intobject.h

index d1985748b3e..60cb9e0c44b 100644

--- a/Include/intobject.h

+++ b/Include/intobject.h

@@ -78,6 +78,8 @@ PyAPI_FUNC(PyObject *) _PyInt_FormatAdvanced(PyObject *obj,

 					     char *format_spec,

 					     Py_ssize_t format_spec_len);

+PyAPI_FUNC(void) _PyInt_DebugMallocStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/listobject.h b/Include/listobject.h

index f19b1c5e56c..7fccb477e1e 100644

--- a/Include/listobject.h

+++ b/Include/listobject.h

@@ -62,6 +62,8 @@ PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *);

 #define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v))

 #define PyList_GET_SIZE(op)    Py_SIZE(op)

+PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/methodobject.h b/Include/methodobject.h

index 6e160b63900..1944517b392 100644

--- a/Include/methodobject.h

+++ b/Include/methodobject.h

@@ -87,6 +87,10 @@ typedef struct {

 PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);

+PyAPI_FUNC(void) _PyCFunction_DebugMallocStats(FILE *out);

+PyAPI_FUNC(void) _PyMethod_DebugMallocStats(FILE *out);

+

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/object.h b/Include/object.h

index 807b24188a7..a9d207929e0 100644

--- a/Include/object.h

+++ b/Include/object.h

@@ -1040,6 +1040,13 @@ PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);

             _PyTrash_thread_deposit_object((PyObject*)op); \

     } while (0);

+PyAPI_FUNC(void)

+_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,

+		       size_t sizeof_block);

+

+PyAPI_FUNC(void)

+_PyObject_DebugTypeStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/objimpl.h b/Include/objimpl.h

index cbf6bc3f876..8c14ab801a1 100644

--- a/Include/objimpl.h

+++ b/Include/objimpl.h

@@ -101,13 +101,13 @@ PyAPI_FUNC(void) PyObject_Free(void *);

 /* Macros */

 #ifdef WITH_PYMALLOC

+PyAPI_FUNC(void) _PyObject_DebugMallocStats(FILE *out);

 #ifdef PYMALLOC_DEBUG   /* WITH_PYMALLOC && PYMALLOC_DEBUG */

 PyAPI_FUNC(void *) _PyObject_DebugMalloc(size_t nbytes);

 PyAPI_FUNC(void *) _PyObject_DebugRealloc(void *p, size_t nbytes);

 PyAPI_FUNC(void) _PyObject_DebugFree(void *p);

 PyAPI_FUNC(void) _PyObject_DebugDumpAddress(const void *p);

 PyAPI_FUNC(void) _PyObject_DebugCheckAddress(const void *p);

-PyAPI_FUNC(void) _PyObject_DebugMallocStats(void);

 PyAPI_FUNC(void *) _PyObject_DebugMallocApi(char api, size_t nbytes);

 PyAPI_FUNC(void *) _PyObject_DebugReallocApi(char api, void *p, size_t nbytes);

 PyAPI_FUNC(void) _PyObject_DebugFreeApi(char api, void *p);

diff --git a/Include/stringobject.h b/Include/stringobject.h

index 12cc093c629..0a5fbd1c2e7 100644

--- a/Include/stringobject.h

+++ b/Include/stringobject.h

@@ -204,6 +204,8 @@ PyAPI_FUNC(PyObject *) _PyBytes_FormatAdvanced(PyObject *obj,

 					       char *format_spec,

 					       Py_ssize_t format_spec_len);

+PyAPI_FUNC(void) _PyString_DebugMallocStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h

index 7781f966301..321bd20f2f7 100644

--- a/Include/unicodeobject.h

+++ b/Include/unicodeobject.h

@@ -1406,6 +1406,8 @@ PyAPI_FUNC(int) _PyUnicode_IsAlpha(

     Py_UNICODE ch       /* Unicode character */

     );

+PyAPI_FUNC(void) _PyUnicode_DebugMallocStats(FILE *out);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py

index 9342716272a..331c0e9391e 100644

--- a/Lib/test/test_sys.py

+++ b/Lib/test/test_sys.py

@@ -487,6 +487,32 @@ class SysModuleTest(unittest.TestCase):

         p.wait()

         self.assertIn(executable, ["''", repr(sys.executable)])

+    def test_debugmallocstats(self):

+        # Test sys._debugmallocstats()

+

+        import subprocess

+

+        # Verify the default of writing to stderr:

+        p = subprocess.Popen([sys.executable,

+                              '-c', 'import sys; sys._debugmallocstats()'],

+                             stderr=subprocess.PIPE)

+        out, err = p.communicate()

+        p.wait()

+        self.assertIn("arenas allocated current", err)

+                                     

+        # Verify that we can redirect the output to a file (not a file-like

+        # object, though):

+        with open('mallocstats.txt', 'w') as out:

+            sys._debugmallocstats(out)

+        result = open('mallocstats.txt').read()

+        self.assertIn("arenas allocated current", result)

+        os.unlink('mallocstats.txt')

+

+        # Verify that the destination must be a file:

+        with self.assertRaises(TypeError):

+            sys._debugmallocstats(42)

+        

+

 @test.test_support.cpython_only

 class SizeofTest(unittest.TestCase):

diff --git a/Objects/classobject.c b/Objects/classobject.c

index 02d7cfd019b..1c44a4729c9 100644

--- a/Objects/classobject.c

+++ b/Objects/classobject.c

@@ -2691,3 +2691,12 @@ PyMethod_Fini(void)

 {

     (void)PyMethod_ClearFreeList();

 }

+

+/* Print summary info about the state of the optimized allocator */

+void

+_PyMethod_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PyMethodObject",

+                           numfree, sizeof(PyMethodObject));

+}

diff --git a/Objects/dictobject.c b/Objects/dictobject.c

index c544ecd8c2d..89ca39c97d4 100644

--- a/Objects/dictobject.c

+++ b/Objects/dictobject.c

@@ -225,6 +225,15 @@ show_track(void)

 static PyDictObject *free_list[PyDict_MAXFREELIST];

 static int numfree = 0;

+/* Print summary info about the state of the optimized allocator */

+void

+_PyDict_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PyDictObject", numfree, sizeof(PyDictObject));

+}

+

+

 void

 PyDict_Fini(void)

 {

diff --git a/Objects/floatobject.c b/Objects/floatobject.c

index 5954d39cdb3..02acc8c0611 100644

--- a/Objects/floatobject.c

+++ b/Objects/floatobject.c

@@ -34,6 +34,22 @@ typedef struct _floatblock PyFloatBlock;

 static PyFloatBlock *block_list = NULL;

 static PyFloatObject *free_list = NULL;

+/* Print summary info about the state of the optimized allocator */

+void

+_PyFloat_DebugMallocStats(FILE *out)

+{

+  int num_blocks = 0;

+  PyFloatBlock *block;

+

+  /* Walk the block list, counting */

+  for (block = block_list; block ; block = block->next) {

+      num_blocks++;

+  }

+

+  _PyDebugAllocatorStats(out,

+                         "PyFloatBlock", num_blocks, sizeof(PyFloatBlock));

+}

+

 static PyFloatObject *

 fill_free_list(void)

 {

diff --git a/Objects/frameobject.c b/Objects/frameobject.c

index 4c91dd0c084..03a66dc9057 100644

--- a/Objects/frameobject.c

+++ b/Objects/frameobject.c

@@ -1019,3 +1019,13 @@ PyFrame_Fini(void)

     Py_XDECREF(builtin_object);

     builtin_object = NULL;

 }

+

+/* Print summary info about the state of the optimized allocator */

+void

+_PyFrame_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PyFrameObject",

+                           numfree, sizeof(PyFrameObject));

+}

+

diff --git a/Objects/intobject.c b/Objects/intobject.c

index 9b27c35d88d..703fa5a5880 100644

--- a/Objects/intobject.c

+++ b/Objects/intobject.c

@@ -44,6 +44,23 @@ typedef struct _intblock PyIntBlock;

 static PyIntBlock *block_list = NULL;

 static PyIntObject *free_list = NULL;

+

+/* Print summary info about the state of the optimized allocator */

+void

+_PyInt_DebugMallocStats(FILE *out)

+{

+    int num_blocks = 0;

+    PyIntBlock *block;

+

+    /* Walk the block list, counting */

+    for (block = block_list; block ; block = block->next) {

+        num_blocks++;

+    }

+

+    _PyDebugAllocatorStats(out,

+                           "PyIntBlock", num_blocks, sizeof(PyIntBlock));

+}

+

 static PyIntObject *

 fill_free_list(void)

 {

diff --git a/Objects/listobject.c b/Objects/listobject.c

index 24eff769c64..38848bd5cf6 100644

--- a/Objects/listobject.c

+++ b/Objects/listobject.c

@@ -109,6 +109,15 @@ PyList_Fini(void)

     }

 }

+/* Print summary info about the state of the optimized allocator */

+void

+_PyList_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PyListObject",

+                           numfree, sizeof(PyListObject));

+}

+

 PyObject *

 PyList_New(Py_ssize_t size)

 {

diff --git a/Objects/methodobject.c b/Objects/methodobject.c

index c1a99ab2687..ea5df77ae1c 100644

--- a/Objects/methodobject.c

+++ b/Objects/methodobject.c

@@ -412,6 +412,15 @@ PyCFunction_Fini(void)

     (void)PyCFunction_ClearFreeList();

 }

+/* Print summary info about the state of the optimized allocator */

+void

+_PyCFunction_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PyCFunction",

+                           numfree, sizeof(PyCFunction));

+}

+

 /* PyCFunction_New() is now just a macro that calls PyCFunction_NewEx(),

    but it's part of the API so we need to keep a function around that

    existing C extensions can call.

diff --git a/Objects/object.c b/Objects/object.c

index 65366b0b351..acef3ce32cd 100644

--- a/Objects/object.c

+++ b/Objects/object.c

@@ -2360,6 +2360,23 @@ PyMem_Free(void *p)

     PyMem_FREE(p);

 }

+void

+_PyObject_DebugTypeStats(FILE *out)

+{

+    _PyString_DebugMallocStats(out);

+    _PyCFunction_DebugMallocStats(out);

+    _PyDict_DebugMallocStats(out);

+    _PyFloat_DebugMallocStats(out);

+    _PyFrame_DebugMallocStats(out);

+    _PyInt_DebugMallocStats(out);

+    _PyList_DebugMallocStats(out);

+    _PyMethod_DebugMallocStats(out);

+    _PySet_DebugMallocStats(out);

+    _PyTuple_DebugMallocStats(out);

+#if Py_USING_UNICODE

+    _PyUnicode_DebugMallocStats(out);

+#endif

+}

 /* These methods are used to control infinite recursion in repr, str, print,

    etc.  Container objects that may recursively contain themselves,

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c

index 2067cf54e74..71da93887cf 100644

--- a/Objects/obmalloc.c

+++ b/Objects/obmalloc.c

@@ -547,12 +547,10 @@ static struct arena_object* usable_arenas = NULL;

 /* Number of arenas allocated that haven't been free()'d. */

 static size_t narenas_currently_allocated = 0;

-#ifdef PYMALLOC_DEBUG

 /* Total number of times malloc() called to allocate an arena. */

 static size_t ntimes_arena_allocated = 0;

 /* High water mark (max value ever seen) for narenas_currently_allocated. */

 static size_t narenas_highwater = 0;

-#endif

 /* Allocate a new arena.  If we run out of memory, return NULL.  Else

  * allocate a new arena, and return the address of an arena_object

@@ -569,7 +567,7 @@ new_arena(void)

 #ifdef PYMALLOC_DEBUG

     if (Py_GETENV("PYTHONMALLOCSTATS"))

-        _PyObject_DebugMallocStats();

+        _PyObject_DebugMallocStats(stderr);

 #endif

     if (unused_arena_objects == NULL) {

         uint i;

@@ -637,11 +635,9 @@ new_arena(void)

     arenaobj->address = (uptr)address;

     ++narenas_currently_allocated;

-#ifdef PYMALLOC_DEBUG

     ++ntimes_arena_allocated;

     if (narenas_currently_allocated > narenas_highwater)

         narenas_highwater = narenas_currently_allocated;

-#endif

     arenaobj->freepools = NULL;

     /* pool_address <- first pool-aligned address in the arena

        nfreepools <- number of whole pools that fit after alignment */

@@ -1802,17 +1798,19 @@ _PyObject_DebugDumpAddress(const void *p)

     }

 }

+#endif  /* PYMALLOC_DEBUG */

+

 static size_t

-printone(const char* msg, size_t value)

+printone(FILE *out, const char* msg, size_t value)

 {

     int i, k;

     char buf[100];

     size_t origvalue = value;

-    fputs(msg, stderr);

+    fputs(msg, out);

     for (i = (int)strlen(msg); i < 35; ++i)

-        fputc(' ', stderr);

-    fputc('=', stderr);

+        fputc(' ', out);

+    fputc('=', out);

     /* Write the value with commas. */

     i = 22;

@@ -1833,17 +1831,32 @@ printone(const char* msg, size_t value)

     while (i >= 0)

         buf[i--] = ' ';

-    fputs(buf, stderr);

+    fputs(buf, out);

     return origvalue;

 }

-/* Print summary info to stderr about the state of pymalloc's structures.

+void

+_PyDebugAllocatorStats(FILE *out,

+                       const char *block_name, int num_blocks, size_t sizeof_block)

+{

+       char buf1[128];

+       char buf2[128];

+       PyOS_snprintf(buf1, sizeof(buf1),

+                     "%d %ss * %zd bytes each",

+                     num_blocks, block_name, sizeof_block);

+       PyOS_snprintf(buf2, sizeof(buf2),

+                     "%48s ", buf1);

+      (void)printone(out, buf2, num_blocks * sizeof_block);

+}

+

+

+/* Print summary info to "out" about the state of pymalloc's structures.

  * In Py_DEBUG mode, also perform some expensive internal consistency

  * checks.

  */

 void

-_PyObject_DebugMallocStats(void)

+_PyObject_DebugMallocStats(FILE *out)

 {

     uint i;

     const uint numclasses = SMALL_REQUEST_THRESHOLD >> ALIGNMENT_SHIFT;

@@ -1872,7 +1885,7 @@ _PyObject_DebugMallocStats(void)

     size_t total;

     char buf[128];

-    fprintf(stderr, "Small block threshold = %d, in %u size classes.\n",

+    fprintf(out, "Small block threshold = %d, in %u size classes.\n",

             SMALL_REQUEST_THRESHOLD, numclasses);

     for (i = 0; i < numclasses; ++i)

@@ -1926,10 +1939,10 @@ _PyObject_DebugMallocStats(void)

     }

     assert(narenas == narenas_currently_allocated);

-    fputc('\n', stderr);

+    fputc('\n', out);

     fputs("class   size   num pools   blocks in use  avail blocks\n"

           "-----   ----   ---------   -------------  ------------\n",

-          stderr);

+          out);

     for (i = 0; i < numclasses; ++i) {

         size_t p = numpools[i];

@@ -1940,7 +1953,7 @@ _PyObject_DebugMallocStats(void)

             assert(b == 0 && f == 0);

             continue;

         }

-        fprintf(stderr, "%5u %6u "

+        fprintf(out, "%5u %6u "

                         "%11" PY_FORMAT_SIZE_T "u "

                         "%15" PY_FORMAT_SIZE_T "u "

                         "%13" PY_FORMAT_SIZE_T "u\n",

@@ -1950,36 +1963,35 @@ _PyObject_DebugMallocStats(void)

         pool_header_bytes += p * POOL_OVERHEAD;

         quantization += p * ((POOL_SIZE - POOL_OVERHEAD) % size);

     }

-    fputc('\n', stderr);

-    (void)printone("# times object malloc called", serialno);

-

-    (void)printone("# arenas allocated total", ntimes_arena_allocated);

-    (void)printone("# arenas reclaimed", ntimes_arena_allocated - narenas);

-    (void)printone("# arenas highwater mark", narenas_highwater);

-    (void)printone("# arenas allocated current", narenas);

+    fputc('\n', out);

+#ifdef PYMALLOC_DEBUG

+    (void)printone(out, "# times object malloc called", serialno);

+#endif

+    (void)printone(out, "# arenas allocated total", ntimes_arena_allocated);

+    (void)printone(out, "# arenas reclaimed", ntimes_arena_allocated - narenas);

+    (void)printone(out, "# arenas highwater mark", narenas_highwater);

+    (void)printone(out, "# arenas allocated current", narenas);

     PyOS_snprintf(buf, sizeof(buf),

         "%" PY_FORMAT_SIZE_T "u arenas * %d bytes/arena",

         narenas, ARENA_SIZE);

-    (void)printone(buf, narenas * ARENA_SIZE);

+    (void)printone(out, buf, narenas * ARENA_SIZE);

-    fputc('\n', stderr);

+    fputc('\n', out);

-    total = printone("# bytes in allocated blocks", allocated_bytes);

-    total += printone("# bytes in available blocks", available_bytes);

+    total = printone(out, "# bytes in allocated blocks", allocated_bytes);

+    total += printone(out, "# bytes in available blocks", available_bytes);

     PyOS_snprintf(buf, sizeof(buf),

         "%u unused pools * %d bytes", numfreepools, POOL_SIZE);

-    total += printone(buf, (size_t)numfreepools * POOL_SIZE);

+    total += printone(out, buf, (size_t)numfreepools * POOL_SIZE);

-    total += printone("# bytes lost to pool headers", pool_header_bytes);

-    total += printone("# bytes lost to quantization", quantization);

-    total += printone("# bytes lost to arena alignment", arena_alignment);

-    (void)printone("Total", total);

+    total += printone(out, "# bytes lost to pool headers", pool_header_bytes);

+    total += printone(out, "# bytes lost to quantization", quantization);

+    total += printone(out, "# bytes lost to arena alignment", arena_alignment);

+    (void)printone(out, "Total", total);

 }

-#endif  /* PYMALLOC_DEBUG */

-

 #ifdef Py_USING_MEMORY_DEBUGGER

 /* Make this function last so gcc won't inline it since the definition is

  * after the reference.

diff --git a/Objects/setobject.c b/Objects/setobject.c

index 31da3dbfecb..da086ab2bdb 100644

--- a/Objects/setobject.c

+++ b/Objects/setobject.c

@@ -1087,6 +1087,16 @@ PySet_Fini(void)

     Py_CLEAR(emptyfrozenset);

 }

+/* Print summary info about the state of the optimized allocator */

+void

+_PySet_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out,

+                           "free PySetObject",

+                           numfree, sizeof(PySetObject));

+}

+

+

 static PyObject *

 set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)

 {

diff --git a/Objects/stringobject.c b/Objects/stringobject.c

index c47d32f4060..b1ffa249745 100644

--- a/Objects/stringobject.c

+++ b/Objects/stringobject.c

@@ -4880,3 +4880,43 @@ void _Py_ReleaseInternedStrings(void)

     PyDict_Clear(interned);

     Py_CLEAR(interned);

 }

+

+void _PyString_DebugMallocStats(FILE *out)

+{

+    ssize_t i;

+    int num_immortal = 0, num_mortal = 0;

+    ssize_t immortal_size = 0, mortal_size = 0;

+

+    if (interned == NULL || !PyDict_Check(interned))

+        return;

+

+    for (i = 0; i <= ((PyDictObject*)interned)->ma_mask; i++) {

+        PyDictEntry *ep = ((PyDictObject*)interned)->ma_table + i;

+        PyObject *pvalue = ep->me_value;

+        if (pvalue != NULL) {

+            PyStringObject *s = (PyStringObject *)ep->me_key;

+

+            switch (s->ob_sstate) {

+            case SSTATE_NOT_INTERNED:

+                /* XXX Shouldn't happen */

+                break;

+            case SSTATE_INTERNED_IMMORTAL:

+                num_immortal ++;

+                immortal_size += s->ob_size;

+                break;

+            case SSTATE_INTERNED_MORTAL:

+                num_mortal ++;

+                mortal_size += s->ob_size;

+                break;

+            default:

+                Py_FatalError("Inconsistent interned string state.");

+            }

+        }

+    }

+

+    fprintf(out, "%d mortal interned strings\n", num_mortal);

+    fprintf(out, "%d immortal interned strings\n", num_immortal);

+    fprintf(out, "total size of all interned strings: "

+            "%zi/%zi "

+            "mortal/immortal\n", mortal_size, immortal_size);

+}

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c

index 6f4b18cc5c6..e8e44901589 100644

--- a/Objects/tupleobject.c

+++ b/Objects/tupleobject.c

@@ -44,6 +44,22 @@ show_track(void)

 }

 #endif

+/* Print summary info about the state of the optimized allocator */

+void

+_PyTuple_DebugMallocStats(FILE *out)

+{

+#if PyTuple_MAXSAVESIZE > 0

+    int i;

+    char buf[128];

+    for (i = 1; i < PyTuple_MAXSAVESIZE; i++) {

+        PyOS_snprintf(buf, sizeof(buf),

+                      "free %d-sized PyTupleObject", i);

+        _PyDebugAllocatorStats(out,

+                               buf,

+                               numfree[i], _PyObject_VAR_SIZE(&PyTuple_Type, i));

+    }

+#endif

+}

 PyObject *

 PyTuple_New(register Py_ssize_t size)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c

index a859fa05214..b6ff83e110e 100644

--- a/Objects/unicodeobject.c

+++ b/Objects/unicodeobject.c

@@ -9018,6 +9018,12 @@ _PyUnicode_Fini(void)

     (void)PyUnicode_ClearFreeList();

 }

+void _PyUnicode_DebugMallocStats(FILE *out)

+{

+    _PyDebugAllocatorStats(out, "free PyUnicodeObject", numfree,

+                           sizeof(PyUnicodeObject));

+}

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/Python/pythonrun.c b/Python/pythonrun.c

index abdfb146ae5..d9a0e98a9e9 100644

--- a/Python/pythonrun.c

+++ b/Python/pythonrun.c

@@ -562,7 +562,7 @@ Py_Finalize(void)

 #endif /* Py_TRACE_REFS */

 #ifdef PYMALLOC_DEBUG

     if (Py_GETENV("PYTHONMALLOCSTATS"))

-        _PyObject_DebugMallocStats();

+        _PyObject_DebugMallocStats(stderr);

 #endif

     call_ll_exitfuncs();

diff --git a/Python/sysmodule.c b/Python/sysmodule.c

index 22238ba8ce4..95bfb40bee7 100644

--- a/Python/sysmodule.c

+++ b/Python/sysmodule.c

@@ -890,6 +890,57 @@ a 11-tuple where the entries in the tuple are counts of:\n\

 extern "C" {

 #endif

+static PyObject *

+sys_debugmallocstats(PyObject *self, PyObject *args)

+{

+    PyObject *file = NULL;

+    FILE *fp;

+

+    if (!PyArg_ParseTuple(args, "|O!",