Skip to content

GH-100987: Allow non python frames in frame stack. #103010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markshannon wants to merge 8 commits into from
Closed

GH-100987: Allow non python frames in frame stack. #103010

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bbb99c1
Rename local variables, names and consts, from the interpeter loop. W…
markshannon Mar 9, 2023
8bee1b8
Remove unused dummy variables.
markshannon Mar 9, 2023
f1b67c2
All any object as 'code' field in PyInterpreterFrame.
markshannon Mar 10, 2023
06e914b
Allow minimal frames in frame stack.
markshannon Mar 15, 2023
3e2c3ab
Insert introspectable frames for each non-Python call from interpreter.
markshannon Mar 15, 2023
75bdd67
Merge branch 'main' into allow-non-python-frames
markshannon Mar 23, 2023
8e555ca
Fixup faulthandler test.
markshannon Mar 23, 2023
44978c1
Restore _PyFrame_IsEntryFrame API.
markshannon Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixup faulthandler test.
  • Loading branch information
@markshannon
markshannon committed Mar 23, 2023
commit 8e555ca460d5c21f46c0801bb09b072a3561e590
17 changes: 12 additions & 5 deletions Lib/test/test_faulthandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ def check_error(self, code, lineno, fatal_error, *,
# Enable MULTILINE flag
regex = f'(?m){regex}'
output, exitcode = self.get_output(code, filename=filename, fd=fd)
output = '\n'.join(output)
output = '\n'.join([line for line in output if
"Builtin function" not in line and
"Method descriptor" not in line])
self.assertRegex(output, regex)
self.assertNotEqual(exitcode, 0)

Expand Down Expand Up @@ -484,6 +486,7 @@ def funcA():
lineno = 14
expected = [
'Stack (most recent call first):',
' Builtin function dump_traceback',
' File "<string>", line %s in funcB' % lineno,
' File "<string>", line 17 in funcA',
' File "<string>", line 19 in <module>'
Expand Down Expand Up @@ -529,6 +532,7 @@ def {func_name}():
)
expected = [
'Stack (most recent call first):',
' Builtin function dump_traceback',
' File "<string>", line 4 in %s' % truncated,
' File "<string>", line 6 in <module>'
]
Expand Down Expand Up @@ -575,7 +579,9 @@ def run(self):
"""
code = code.format(filename=repr(filename))
output, exitcode = self.get_output(code, filename)
output = '\n'.join(output)
output = '\n'.join([line for line in output if
"Builtin function" not in line and
"Method descriptor" not in line])
if filename:
lineno = 8
else:
Expand Down Expand Up @@ -651,8 +657,9 @@ def func(timeout, repeat, cancel, file, loops):
fd=fd,
)
trace, exitcode = self.get_output(code, filename)
trace = '\n'.join(trace)

trace = '\n'.join([line for line in trace if
"Builtin function" not in line and
"Method descriptor" not in line])
if not cancel:
count = loops
if repeat:
Expand Down Expand Up @@ -754,7 +761,7 @@ def handler(signum, frame):
fd=fd,
)
trace, exitcode = self.get_output(code, filename)
trace = '\n'.join(trace)
trace = '\n'.join([line for line in trace if "Builtin function" not in line ])
if not unregister:
if all_threads:
regex = r'Current thread 0x[0-9a-f]+ \(most recent call first\):\n'
Expand Down