diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-11-13 14:50:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 14:50:56 (GMT) |
commit | d57a3e5d03efdda6247c27bd682872edf399d88b (patch) | |
tree | ebe534112b37d06155291a82382ea0b0313a73e6 | |
parent | 55b4771d5d18d5ff7c095aa1ab750fe0c8bb5e67 (diff) | |
download | cpython-d57a3e5d03efdda6247c27bd682872edf399d88b.zip cpython-d57a3e5d03efdda6247c27bd682872edf399d88b.tar.gz cpython-d57a3e5d03efdda6247c27bd682872edf399d88b.tar.bz2 |
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.
-rw-r--r-- | Lib/test/test_capi.py | 4 | ||||
-rw-r--r-- | Modules/_tracemalloc.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 49297f4..65e0795 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 e07022c..7f19c55 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; |