Skip to content

GH-107674: Avoid allocating boxed ints for sys.settrace line events #107780

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 6 commits into from
Aug 10, 2023
Merged

GH-107674: Avoid allocating boxed ints for sys.settrace line events #107780

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ccd3bb
Use PyLong_FromLong instead of PyLong_FromSsize_t in instrumentation.c.
markshannon Aug 5, 2023
83ffca9
Avoid boxing and unboxing line number for sys.settrace
markshannon Aug 5, 2023
de050f2
Add news
markshannon Aug 5, 2023
9077b17
Address review comments
markshannon Aug 9, 2023
7460a99
Clarify comments
markshannon Aug 9, 2023
6b4bafb
Fix editing
markshannon Aug 9, 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
Address review comments
  • Loading branch information
@markshannon
markshannon committed Aug 9, 2023
commit 9077b17598633be15ebc8cff3858100975338c51
12 changes: 9 additions & 3 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,17 +1152,20 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
code->_co_monitoring->local_monitors.tools[PY_MONITORING_EVENT_LINE]
);
/* Special case sys.settrace to avoid boxing the line number,
* only to unbox it. */
* only to immediately unbox it. */
if (tools & (1 << PY_MONITORING_SYS_TRACE_ID)) {
if (tstate->c_tracefunc != NULL && line >= 0) {
PyFrameObject *frame_obj = _PyFrame_GetFrameObject(frame);
if (frame_obj == NULL) {
return -1;
}
if (frame_obj->f_trace_lines) {
/* Set tracing and what_event as we do for
* instrumentation */
int old_what = tstate->what_event;
tstate->what_event = PY_MONITORING_EVENT_LINE;
tstate->tracing++;
/* Call c_tracefunc directly */
Py_INCREF(frame_obj);
frame_obj->f_lineno = line;
int err = tstate->c_tracefunc(tstate->c_traceobj, frame_obj, PyTrace_LINE, Py_None);
Expand All @@ -1177,12 +1180,15 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
}
tools &= (255 - (1 << PY_MONITORING_SYS_TRACE_ID));
Comment thread
ericsnowcurrently marked this conversation as resolved.
}
if (tools == 0) {
goto done;
}
PyObject *line_obj = PyLong_FromLong(line);
Comment thread
markshannon marked this conversation as resolved.
if (line_obj == NULL) {
return -1;
}
PyObject *args[3] = { NULL, (PyObject *)code, line_obj };
while (tools) {
do {
int tool = most_significant_bit(tools);
assert(tool >= 0 && tool < PY_MONITORING_SYS_PROFILE_ID);
assert(tools & (1 << tool));
Expand All @@ -1202,7 +1208,7 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
/* DISABLE */
remove_line_tools(code, i, 1 << tool);
}
}
} while (tools);
Py_DECREF(line_obj);
done:
assert(original_opcode != 0);
Expand Down