Skip to content

bpo-45256: Don't track the exact depth of each InterpreterFrame #30372

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

Merged
markshannon merged 7 commits into from
Jan 5, 2022
Merged

bpo-45256: Don't track the exact depth of each InterpreterFrame #30372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2713a36
Stop tracking the exact depth of each frame
brandtbucher Jan 3, 2022
439a0c2
Clean up comment
brandtbucher Jan 3, 2022
6037cba
Fix test for sizeof(frame)
brandtbucher Jan 3, 2022
323da04
Fix test for sizeof(generator)
brandtbucher Jan 3, 2022
1ab3a8f
Catch up with main
brandtbucher Jan 4, 2022
98c58f3
Apply suggestions from code review
brandtbucher Jan 4, 2022
369983b
Don't bother unsetting frame->is_entry
brandtbucher Jan 4, 2022
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
Apply suggestions from code review
  • Loading branch information
@brandtbucher
brandtbucher committed Jan 4, 2022
commit 98c58f3b8af7fd1a3ca630a5bf0e5da40998d462
4 changes: 2 additions & 2 deletions Include/internal/pycore_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ typedef struct _interpreter_frame {
int f_lasti; /* Last instruction if called */
int stacktop; /* Offset of TOS from localsplus */
PyFrameState f_state; /* What state the frame is in */
bool own_cframe; // Whether this is the "root" frame for the current CFrame
bool is_entry; // Whether this is the "root" frame for the current CFrame.
PyObject *localsplus[1];
} InterpreterFrame;

Expand Down Expand Up @@ -103,7 +103,7 @@ _PyFrame_InitializeSpecials(
frame->generator = NULL;
frame->f_lasti = -1;
frame->f_state = FRAME_CREATED;
frame->own_cframe = true;
frame->is_entry = false;
}

/* Gets the pointer to the locals array
Expand Down
16 changes: 8 additions & 8 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
cframe.previous = prev_cframe;
tstate->cframe = &cframe;

assert(frame->own_cframe);
assert(!frame->is_entry);
frame->is_entry = true;
/* Push frame */
frame->previous = prev_cframe->current_frame;
cframe.current_frame = frame;
Expand Down Expand Up @@ -2310,7 +2311,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
_PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->previous = frame;
frame = cframe.current_frame = new_frame;
frame->own_cframe = false;
goto start_frame;
}

Expand Down Expand Up @@ -2475,7 +2475,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
TRACE_FUNCTION_EXIT();
DTRACE_FUNCTION_EXIT();
_Py_LeaveRecursiveCall(tstate);
if (!frame->own_cframe) {
if (!frame->is_entry) {
frame = cframe.current_frame = pop_frame(tstate, frame);
_PyFrame_StackPush(frame, retval);
goto resume_frame;
Expand Down Expand Up @@ -2625,7 +2625,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
}

TARGET(SEND) {
assert(frame->own_cframe);
assert(frame->is_entry);
assert(STACK_LEVEL() >= 2);
PyObject *v = POP();
PyObject *receiver = TOP();
Expand Down Expand Up @@ -2680,11 +2680,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
tstate->cframe->use_tracing = cframe.use_tracing;
assert(tstate->cframe->current_frame == frame->previous);
assert(!_PyErr_Occurred(tstate));
frame->is_entry = false;
return retval;
}

TARGET(YIELD_VALUE) {
assert(frame->own_cframe);
assert(frame->is_entry);
PyObject *retval = POP();

if (frame->f_code->co_flags & CO_ASYNC_GENERATOR) {
Expand All @@ -2706,6 +2707,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
tstate->cframe->use_tracing = cframe.use_tracing;
assert(tstate->cframe->current_frame == frame->previous);
assert(!_PyErr_Occurred(tstate));
frame->is_entry = false;
return retval;
}

Expand Down Expand Up @@ -4620,7 +4622,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
_PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->previous = frame;
cframe.current_frame = frame = new_frame;
frame->own_cframe = false;
goto start_frame;
}
}
Expand Down Expand Up @@ -4714,7 +4715,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
_PyFrame_SetStackPointer(frame, stack_pointer);
new_frame->previous = frame;
frame = cframe.current_frame = new_frame;
frame->own_cframe = false;
goto start_frame;
}

Expand Down Expand Up @@ -5390,7 +5390,7 @@ MISS_WITH_OPARG_COUNTER(STORE_SUBSCR)
exit_unwind:
assert(_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCall(tstate);
if (frame->own_cframe) {
if (frame->is_entry) {
/* Restore previous cframe and exit */
tstate->cframe = cframe.previous;
tstate->cframe->use_tracing = cframe.use_tracing;
Expand Down
10 changes: 5 additions & 5 deletions Tools/gdb/libpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,8 @@ def _f_nlocalsplus(self):
def _f_lasti(self):
return self._f_special("f_lasti", int_from_int)

def own_cframe(self):
return self._f_special("own_cframe", bool)
def is_entry(self):
return self._f_special("is_entry", bool)

def previous(self):
return self._f_special("previous", PyFramePtr)
Expand Down Expand Up @@ -1860,7 +1860,7 @@ def print_summary(self):
line = interp_frame.current_line()
if line is not None:
sys.stdout.write(' %s\n' % line.strip())
if interp_frame.own_cframe():
if interp_frame.is_entry():
break
else:
sys.stdout.write('#%i (unable to read python frame information)\n' % self.get_index())
Expand All @@ -1883,7 +1883,7 @@ def print_traceback(self):
line = interp_frame.current_line()
if line is not None:
sys.stdout.write(' %s\n' % line.strip())
if interp_frame.own_cframe():
if interp_frame.is_entry():
break
else:
sys.stdout.write(' (unable to read python frame information)\n')
Expand Down Expand Up @@ -2147,7 +2147,7 @@ def invoke(self, args, from_tty):
% (pyop_name.proxyval(set()),
pyop_value.get_truncated_repr(MAX_OUTPUT_LEN)))

if pyop_frame.own_cframe():
if pyop_frame.is_entry():
break

pyop_frame = pyop_frame.previous()
Expand Down