languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 17:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

GH-96612: Skip incomplete frames in tracemalloc traces. (GH-96613)

Browse source
This commit is contained in:
Mark Shannon 2022-09-06 17:37:47 +01:00 committed by GitHub
parent f0d9136c69
commit 95e271b226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_tracemalloc.py
View file

@ -360,6 +360,20 @@ def test_fork(self):
else:
support.wait_process(pid, exitcode=0)
def test_no_incomplete_frames(self):
tracemalloc.stop()
tracemalloc.start(8)
def f(x):
def g():
return x
return g
obj = f(0).__closure__[0]
traceback = tracemalloc.get_object_traceback(obj)
self.assertIn("test_tracemalloc", traceback[-1].filename)
self.assertNotIn("test_tracemalloc", traceback[-2].filename)
class TestSnapshot(unittest.TestCase):
maxDiff = 4000

1
Misc/NEWS.d/next/Core and Builtins/2022-09-06-14-26-36.gh-issue-96612.P4ZbeY.rst Normal file
View file

@ -0,0 +1 @@
Make sure that incomplete frames do not show up in tracemalloc traces.

11
Modules/_tracemalloc.c
View file

@ -400,7 +400,13 @@ traceback_get_frames(traceback_t *traceback)
}
_PyInterpreterFrame *pyframe = tstate->cframe->current_frame;
for (; pyframe != NULL;) {
for (;;) {
while (pyframe && _PyFrame_IsIncomplete(pyframe)) {
pyframe = pyframe->previous;
}
if (pyframe == NULL) {
break;
}
if (traceback->nframe < _Py_tracemalloc_config.max_nframe) {
tracemalloc_get_frame(pyframe, &traceback->frames[traceback->nframe]);
assert(traceback->frames[traceback->nframe].filename != NULL);
@ -410,8 +416,7 @@ traceback_get_frames(traceback_t *traceback)
traceback->total_nframe++;
}
_PyInterpreterFrame *back = pyframe->previous;
pyframe = back;
pyframe = pyframe->previous;
}
}