8000 GH-122548: Implement branch taken and not taken events for sys.monitoring by markshannon · Pull Request #122564 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-122548: Implement branch taken and not taken events for sys.monitoring #122564

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
merged 13 commits into from
Dec 19, 2024
Merged

GH-122548: Implement branch taken and not taken events for sys.monitoring #122564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c5a4b17
Add BRANCH_LEFT and BRANCH_RIGHT events to sys.monitoring for coverag…
markshannon Dec 11, 2024
2814c23
Fix reference counting in _PyMonitoring_RegisterCallback
markshannon Dec 13, 2024
9318ce1
Add new classes to globals check whitelist
markshannon Dec 13, 2024
1b8bb3c
Document new events
markshannon Dec 13, 2024
53ddd91
Fix up docs
markshannon Dec 13, 2024
bdfabc8
More docs updates
markshannon Dec 13, 2024
9cf3619
Fix typo
markshannon Dec 13, 2024
641f290
Fix alignment
markshannon Dec 13, 2024
f21effd
Update C-API docs
markshannon Dec 13, 2024
a604a08
Merge branch 'main' into monitoring-branch-taken
markshannon Dec 14, 2024
0278706
Add NOT_TAKEN in ADDOP_JUMP to tidy up a bit and make the code less e…
markshannon Dec 19, 2024
0258694
Tidy up test for conditional opcodes
markshannon Dec 19, 2024
7110ceb
Merge branch 'main' into monitoring-branch-taken
markshannon Dec 19, 2024
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
Add NOT_TAKEN in ADDOP_JUMP to tidy up a bit and make the code less e… 
…rror prone
  • Loading branch information
@markshannon
markshannon committed Dec 19, 2024
commit 0278706148da1d04cb28de4307a6d50c01897f82
2 changes: 1 addition & 1 deletion Include/internal/pycore_magic_number.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ PC/launcher.c must also be updated.

*/

#define PYC_MAGIC_NUMBER 3610
#define PYC_MAGIC_NUMBER 3611
/* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
(little-endian) and then appending b'\r\n'. */
#define PYC_MAGIC_NUMBER_TOKEN \
Expand Down
27 changes: 12 additions & 15 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,18 @@ codegen_addop_j(instr_sequence *seq, location loc,
assert(IS_JUMP_TARGET_LABEL(target));
assert(OPCODE_HAS_JUMP(opcode) || IS_BLOCK_PUSH_OPCODE(opcode));
assert(!IS_ASSEMBLER_OPCODE(opcode));
return _PyInstructionSequence_Addop(seq, opcode, target.id, loc);
if (_PyInstructionSequence_Addop(seq, opcode, target.id, loc) != SUCCESS) {
return ERROR;
}
switch (opcode) {
case POP_JUMP_IF_FALSE:
case POP_JUMP_IF_TRUE:
case POP_JUMP_IF_NONE:
case POP_JUMP_IF_NOT_NONE:
case FOR_ITER:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth adding a macro for conditional branches next to this one

cpython/Include/internal/pycore_opcode_utils.h

Line 41 in 48c70b8

#define IS_UNCONDITIONAL_JUMP_OPCODE(opcode) \

return _PyInstructionSequence_Addop(seq, NOT_TAKEN, 0, NO_LOCATION);
}
return SUCCESS;
}

#define ADDOP_JUMP(C, LOC, OP, O) \
Expand Down Expand Up @@ -682,7 +693,6 @@ codegen_setup_annotations_scope(compiler *c, location loc,
ADDOP_I(c, loc, COMPARE_OP, (Py_GT << 5) | compare_masks[Py_GT]);
NEW_JUMP_TARGET_LABEL(c, body);
ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, body);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
ADDOP_I(c, loc, LOAD_COMMON_CONSTANT, CONSTANT_NOTIMPLEMENTEDERROR);
ADDOP_I(c, loc, RAISE_VARARGS, 1);
USE_LABEL(c, body);
Expand Down Expand Up @@ -1826,13 +1836,11 @@ codegen_jump_if(compiler *c, location loc,
ADDOP_COMPARE(c, LOC(e), asdl_seq_GET(e->v.Compare.ops, i));
ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), POP_JUMP_IF_FALSE, cleanup);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
}
VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n));
ADDOP_COMPARE(c, LOC(e), asdl_seq_GET(e->v.Compare.ops, n));
ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), cond ? POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE, next);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
NEW_JUMP_TARGET_LABEL(c, end);
ADDOP_JUMP(c, NO_LOCATION, JUMP_NO_INTERRUPT, end);

Expand All @@ -1857,7 +1865,6 @@ codegen_jump_if(compiler *c, location loc,
VISIT(c, expr, e);
ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), cond ? POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE, next);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
return SUCCESS;
}

Expand Down Expand Up @@ -1971,7 +1978,6 @@ codegen_for(compiler *c, stmt_ty s)

USE_LABEL(c, start);
ADDOP_JUMP(c, loc, FOR_ITER, cleanup);
ADDOP(c, NO_LOCATION, NOT_TAKEN);

/* Add NOP to ensure correct line tracing of multiline for statements.
* It will be removed later if redundant.
Expand Down Expand Up @@ -2353,7 +2359,6 @@ codegen_try_except(compiler *c, stmt_ty s)
VISIT(c, expr, handler->v.ExceptHandler.type);
ADDOP(c, loc, CHECK_EXC_MATCH);
ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, except);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
}
if (handler->v.ExceptHandler.name) {
NEW_JUMP_TARGET_LABEL(c, cleanup_end);
Expand Down Expand Up @@ -2548,7 +2553,6 @@ codegen_try_star_except(compiler *c, stmt_ty s)
ADDOP(c, loc, CHECK_EG_MATCH);
ADDOP_I(c, loc, COPY, 1);
ADDOP_JUMP(c, loc, POP_JUMP_IF_NONE, no_match);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
}

NEW_JUMP_TARGET_LABEL(c, cleanup_end);
Expand Down Expand Up @@ -2634,7 +2638,6 @@ codegen_try_star_except(compiler *c, stmt_ty s)
ADDOP_I(c, NO_LOCATION, CALL_INTRINSIC_2, INTRINSIC_PREP_RERAISE_STAR);
ADDOP_I(c, NO_LOCATION, COPY, 1);
ADDOP_JUMP(c, NO_LOCATION, POP_JUMP_IF_NOT_NONE, reraise);
ADDOP(c, NO_LOCATION, NOT_TAKEN);

/* Nothing to reraise */
ADDOP(c, NO_LOCATION, POP_TOP);
Expand Down Expand Up @@ -3484,7 +3487,6 @@ codegen_compare(compiler *c, expr_ty e)
ADDOP_I(c, loc, COPY, 1);
ADDOP(c, loc, TO_BOOL);
ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, cleanup);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
ADDOP(c, loc, POP_TOP);
}
VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n));
Expand Down Expand Up @@ -4197,7 +4199,6 @@ codegen_sync_comprehension_generator(compiler *c, location loc,
ADDOP(c, LOC(gen->iter), GET_ITER);
USE_LABEL(c, start);
ADDOP_JUMP(c, LOC(gen->iter), FOR_ITER, anchor);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
}
VISIT(c, expr, gen->target);

Expand Down Expand Up @@ -4690,7 +4691,6 @@ codegen_with_except_finish(compiler *c, jump_target_label cleanup) {
NEW_JUMP_TARGET_LABEL(c, suppress);
ADDOP(c, NO_LOCATION, TO_BOOL);
ADDOP_JUMP(c, NO_LOCATION, POP_JUMP_IF_TRUE, suppress);
ADDOP(c, NO_LOCATION, NOT_TAKEN);
ADDOP_I(c, NO_LOCATION, RERAISE, 2);

USE_LABEL(c, suppress);
Expand Down Expand Up @@ -5412,9 +5412,6 @@ jump_to_fail_pop(compiler *c, location loc,
Py_ssize_t pops = pc->on_top + PyList_GET_SIZE(pc->stores);
RETURN_IF_ERROR(ensure_fail_pop(c, pc, pops));
ADDOP_JUMP(c, loc, op, pc->fail_pop[pops]);
if (op != JUMP) {
ADDOP(c, NO_LOCATION, NOT_TAKEN);
}
return SUCCESS;
}

Expand Down
0