Skip to content
Snippets Groups Projects
Unverified Commit 95e271b2 authored by Mark Shannon's avatar Mark Shannon Committed by GitHub
Browse files

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

parent f0d9136c
Branches
Tags
No related merge requests found
......@@ -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
......
Make sure that incomplete frames do not show up in tracemalloc traces.
......@@ -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;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment