From d57a3e5d03efdda6247c27bd682872edf399d88b Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 13 Nov 2018 15:50:56 +0100 Subject: [PATCH] bpo-29564:_PyMem_DumpTraceback() suggests enabling tracemalloc (GH-10510) (GH-10517) If tracemalloc is not tracing Python memory allocations, _PyMem_DumpTraceback() now suggests to enable tracemalloc to get the traceback where the memory block has been allocated. --- Lib/test/test_capi.py | 4 ++++ Modules/_tracemalloc.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 49297f461da..65e0795aba8 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -468,6 +468,8 @@ class PyMemDebugTests(unittest.TestCase): r" The block was made by call #[0-9]+ to debug malloc/realloc.\n" r" Data at p: cb cb cb .*\n" r"\n" + r"Enable tracemalloc to get the memory block allocation traceback\n" + r"\n" r"Fatal Python error: bad trailing pad byte") regex = regex.format(ptr=self.PTR_REGEX) regex = re.compile(regex, flags=re.DOTALL) @@ -482,6 +484,8 @@ class PyMemDebugTests(unittest.TestCase): r" The block was made by call #[0-9]+ to debug malloc/realloc.\n" r" Data at p: cb cb cb .*\n" r"\n" + r"Enable tracemalloc to get the memory block allocation traceback\n" + r"\n" r"Fatal Python error: bad ID: Allocated using API 'm', verified using API 'r'\n") regex = regex.format(ptr=self.PTR_REGEX) self.assertRegex(out, regex) diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c index e07022cce2b..7f19c559812 100644 --- a/Modules/_tracemalloc.c +++ b/Modules/_tracemalloc.c @@ -1490,6 +1490,12 @@ _PyMem_DumpTraceback(int fd, const void *ptr) traceback_t *traceback; int i; + if (!tracemalloc_config.tracing) { + PUTS(fd, "Enable tracemalloc to get the memory block " + "allocation traceback\n\n"); + return; + } + traceback = tracemalloc_get_traceback(DEFAULT_DOMAIN, (uintptr_t)ptr); if (traceback == NULL) return;