Skip to content

GH-103082: Filter LINE events in VM, to simplify tool implementation. #104387

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 8 commits into from
May 12, 2023
Merged

GH-103082: Filter LINE events in VM, to simplify tool implementation. #104387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4190fe7
Filter LINE events in VM, to simplify tool implementation.
markshannon May 10, 2023
6e8c98f
Merge branch 'main' into instrument-all-possible-lines
markshannon May 10, 2023
cc62dcb
Add news
markshannon May 10, 2023
5418580
Mark _PyInstrumentation_DISABLE as a legal static value.
markshannon May 10, 2023
1da7272
Merge branch 'main' into instrument-all-possible-lines
markshannon May 10, 2023
e76f241
Address review comments.
markshannon May 11, 2023
b8d6799
Merge branch 'main' into instrument-all-possible-lines
markshannon May 11, 2023
f9cf3db
Add a couple more comments.
markshannon May 11, 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
Add a couple more comments.
  • Loading branch information
@markshannon
markshannon committed May 11, 2023
commit f9cf3db6b9b88e2e3047f598e3635fc2e5e563af
2 changes: 2 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
}
if (_PyOpcode_Caches[original_opcode]) {
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr+1);
/* Prevent the underlying instruction from specializing
* and overwriting the instrumentation. */
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
Comment thread
markshannon marked this conversation as resolved.
}
opcode = original_opcode;
Expand Down
3 changes: 3 additions & 0 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,9 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
int prev_line = _Py_Instrumentation_GetLine(code, prev_index);
if (prev_line == line) {
int prev_opcode = _PyCode_CODE(code)[prev_index].op.code;
/* RESUME and INSTRUMENTED_RESUME are needed for the operation of
* instrumentation, so must never be hidden by an INSTRUMENTED_LINE.
*/
if (prev_opcode != RESUME && prev_opcode != INSTRUMENTED_RESUME) {
Comment thread
markshannon marked this conversation as resolved.
goto done;
}
Expand Down