Skip to content

gh-107265: Fix initialize/remove_tools for ENTER_EXECUTOR case #108482

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

gh-107265: Fix initialize/remove_tools for ENTER_EXECUTOR case #108482

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d48313
gh-107265: Fix initialize_tools for ENTER_EXECUTOR case
corona10 Aug 25, 2023
e7ebb62
Update
corona10 Aug 25, 2023
61aadfd
nit
corona10 Aug 25, 2023
93f43c1
Address code review
corona10 Aug 26, 2023
4b17bb9
fix
corona10 Aug 26, 2023
46d879d
Address code review
corona10 Aug 26, 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 code review
  • Loading branch information
@corona10
corona10 committed Aug 26, 2023
commit 93f43c15e4719b52a3431d5239849ab27b232a76
35 changes: 18 additions & 17 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ de_instrument(PyCodeObject *code, int i, int event)
_PyExecutorObject *exec = code->co_executors->executors[oparg];
opcode_ptr = &exec->vm_data.opcode;
opcode = *opcode_ptr;
assert(opcode != ENTER_EXECUTOR);
}
if (opcode == INSTRUMENTED_LINE) {
opcode_ptr = &code->_co_monitoring->lines[i].original_opcode;
Expand All @@ -580,7 +581,6 @@ de_instrument(PyCodeObject *code, int i, int event)
opcode_ptr = &code->_co_monitoring->per_instruction_opcodes[i];
opcode = *opcode_ptr;
}
assert(opcode != ENTER_EXECUTOR);
int deinstrumented = DE_INSTRUMENT[opcode];
if (deinstrumented == 0) {
return;
Expand Down Expand Up @@ -717,22 +717,23 @@ remove_tools(PyCodeObject * code, int offset, int event, int tools)
assert(event != PY_MONITORING_EVENT_LINE);
assert(event != PY_MONITORING_EVENT_INSTRUCTION);
assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event));
_Py_CODEUNIT co_instr = _PyCode_CODE(code)[offset];
uint8_t co_code = co_instr.op.code;
uint8_t co_arg = co_instr.op.arg;
if (co_code == ENTER_EXECUTOR) {
_PyExecutorObject *exec = code->co_executors->executors[co_arg];
assert(exec != NULL);
assert(exec->vm_data.opcode != ENTER_EXECUTOR);
co_code = _PyOpcode_Deopt[exec->vm_data.opcode];
co_arg = exec->vm_data.oparg;
}
else {
co_code = _Py_GetBaseOpcode(code, offset);
}
assert(co_code != ENTER_EXECUTOR);
assert(opcode_has_event(co_code));
_PyCoMonitoringData *monitoring = code->_co_monitoring;
#ifndef NDEBUG
_Py_CODEUNIT co_instr = _PyCode_CODE(code)[offset];
uint8_t co_code = co_instr.op.code;
uint8_t co_arg = co_instr.op.arg;
Comment thread
corona10 marked this conversation as resolved.
Outdated
if (co_code == ENTER_EXECUTOR) {
_PyExecutorObject *exec = code->co_executors->executors[co_arg];
assert(exec->vm_data.opcode != ENTER_EXECUTOR);
co_code = _PyOpcode_Deopt[exec->vm_data.opcode];
co_arg = exec->vm_data.oparg;
}
else {
co_code = _Py_GetBaseOpcode(code, offset);
}
assert(co_code != ENTER_EXECUTOR);
assert(opcode_has_event(co_code));
_PyCoMonitoringData *monitoring = code->_co_monitoring;
#endif
Comment thread
corona10 marked this conversation as resolved.
if (monitoring && monitoring->tools) {
monitoring->tools[offset] &= ~tools;
if (monitoring->tools[offset] == 0) {
Expand Down