mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

GH-103082: Code cleanup in instrumentation code (#103474)

Browse source
This commit is contained in:
Mark Shannon 2023-04-29 05:51:55 +01:00 • committed by GitHub
parent e1f14643dc
commit 738c226786
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Python/instrumentation.c
View file

@ -113,13 +113,17 @@ static const uint8_t INSTRUMENTED_OPCODES[256] = {
}; };
static inline bool static inline bool
opcode_has_event(int opcode) { opcode_has_event(int opcode)
return opcode < INSTRUMENTED_LINE && {
INSTRUMENTED_OPCODES[opcode] > 0; return (
opcode < INSTRUMENTED_LINE &&
INSTRUMENTED_OPCODES[opcode] > 0
);
} }
static inline bool static inline bool
is_instrumented(int opcode) { is_instrumented(int opcode)
{
assert(opcode != 0); assert(opcode != 0);
assert(opcode != RESERVED); assert(opcode != RESERVED);
return opcode >= MIN_INSTRUMENTED_OPCODE; return opcode >= MIN_INSTRUMENTED_OPCODE;
@ -339,7 +343,8 @@ dump_monitors(const char *prefix, _Py_Monitors monitors, FILE*out)
/* Like _Py_GetBaseOpcode but without asserts. /* Like _Py_GetBaseOpcode but without asserts.
* Does its best to give the right answer, but won't abort * Does its best to give the right answer, but won't abort
* if something is wrong */ * if something is wrong */
int get_base_opcode_best_attempt(PyCodeObject *code, int offset) static int
get_base_opcode_best_attempt(PyCodeObject *code, int offset)
{ {
int opcode = _Py_OPCODE(_PyCode_CODE(code)[offset]); int opcode = _Py_OPCODE(_PyCode_CODE(code)[offset]);
if (INSTRUMENTED_OPCODES[opcode] != opcode) { if (INSTRUMENTED_OPCODES[opcode] != opcode) {
@ -418,13 +423,15 @@ dump_instrumentation_data(PyCodeObject *code, int star, FILE*out)
assert(test); \ assert(test); \
} while (0) } while (0)
bool valid_opcode(int opcode) { static bool
valid_opcode(int opcode)
{
if (opcode > 0 && if (opcode > 0 &&
opcode != RESERVED && opcode != RESERVED &&
opcode < 255 && opcode < 255 &&
_PyOpcode_OpName[opcode] && _PyOpcode_OpName[opcode] &&
_PyOpcode_OpName[opcode][0] != '<' _PyOpcode_OpName[opcode][0] != '<')
) { {
return true; return true;
} }
return false; return false;
@ -781,8 +788,7 @@ add_line_tools(PyCodeObject * code, int offset, int tools)
{ {
assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_LINE, tools)); assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_LINE, tools));
assert(code->_co_monitoring); assert(code->_co_monitoring);
if (code->_co_monitoring->line_tools if (code->_co_monitoring->line_tools) {
) {
code->_co_monitoring->line_tools[offset] |= tools; code->_co_monitoring->line_tools[offset] |= tools;
} }
else { else {
@ -798,8 +804,7 @@ add_per_instruction_tools(PyCodeObject * code, int offset, int tools)
{ {
assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_INSTRUCTION, tools)); assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_INSTRUCTION, tools));
assert(code->_co_monitoring); assert(code->_co_monitoring);
if (code->_co_monitoring->per_instruction_tools if (code->_co_monitoring->per_instruction_tools) {
) {
code->_co_monitoring->per_instruction_tools[offset] |= tools; code->_co_monitoring->per_instruction_tools[offset] |= tools;
} }
else { else {
@ -814,8 +819,7 @@ static void
remove_per_instruction_tools(PyCodeObject * code, int offset, int tools) remove_per_instruction_tools(PyCodeObject * code, int offset, int tools)
{ {
assert(code->_co_monitoring); assert(code->_co_monitoring);
if (code->_co_monitoring->per_instruction_tools) if (code->_co_monitoring->per_instruction_tools) {
{
uint8_t *toolsptr = &code->_co_monitoring->per_instruction_tools[offset]; uint8_t *toolsptr = &code->_co_monitoring->per_instruction_tools[offset];
*toolsptr &= ~tools; *toolsptr &= ~tools;
if (*toolsptr == 0) { if (*toolsptr == 0) {
@ -865,17 +869,16 @@ static const int8_t MOST_SIGNIFICANT_BITS[16] = {
3, 3, 3, 3, 3, 3, 3, 3,
}; };
/* We could use _Py_bit_length here, but that is designed for larger (32/64) bit ints, /* We could use _Py_bit_length here, but that is designed for larger (32/64)
and can perform relatively poorly on platforms without the necessary intrinsics. */ * bit ints, and can perform relatively poorly on platforms without the
* necessary intrinsics. */
static inline int most_significant_bit(uint8_t bits) { static inline int most_significant_bit(uint8_t bits) {
assert(bits != 0); assert(bits != 0);
if (bits > 15) { if (bits > 15) {
return MOST_SIGNIFICANT_BITS[bits>>4]+4; return MOST_SIGNIFICANT_BITS[bits>>4]+4;
} }
else {
return MOST_SIGNIFICANT_BITS[bits]; return MOST_SIGNIFICANT_BITS[bits];
} }
}
static bool static bool
is_version_up_to_date(PyCodeObject *code, PyInterpreterState *interp) is_version_up_to_date(PyCodeObject *code, PyInterpreterState *interp)
@ -1002,8 +1005,8 @@ _Py_call_instrumentation_2args(
int int
_Py_call_instrumentation_jump( _Py_call_instrumentation_jump(
PyThreadState *tstate, int event, PyThreadState *tstate, int event,
_PyInterpreterFrame *frame, _Py_CODEUNIT *instr, _Py_CODEUNIT *target _PyInterpreterFrame *frame, _Py_CODEUNIT *instr, _Py_CODEUNIT *target)
) { {
assert(event == PY_MONITORING_EVENT_JUMP || assert(event == PY_MONITORING_EVENT_JUMP ||
event == PY_MONITORING_EVENT_BRANCH); event == PY_MONITORING_EVENT_BRANCH);
assert(frame->prev_instr == instr); assert(frame->prev_instr == instr);
@ -1309,8 +1312,8 @@ initialize_line_tools(PyCodeObject *code, _Py_Monitors *all_events)
} }
} }
static static int
int allocate_instrumentation_data(PyCodeObject *code) allocate_instrumentation_data(PyCodeObject *code)
{ {
if (code->_co_monitoring == NULL) { if (code->_co_monitoring == NULL) {
@ -1404,7 +1407,7 @@ static const uint8_t super_instructions[256] = {
/* Should use instruction metadata for this */ /* Should use instruction metadata for this */
static bool static bool
is_super_instruction(int opcode) { is_super_instruction(uint8_t opcode) {
return super_instructions[opcode] != 0; return super_instructions[opcode] != 0;
} }
@ -1561,8 +1564,8 @@ static int
check_tool(PyInterpreterState *interp, int tool_id) check_tool(PyInterpreterState *interp, int tool_id)
{ {
if (tool_id < PY_MONITORING_SYS_PROFILE_ID && if (tool_id < PY_MONITORING_SYS_PROFILE_ID &&
interp->monitoring_tool_names[tool_id] == NULL interp->monitoring_tool_names[tool_id] == NULL)
) { {
PyErr_Format(PyExc_ValueError, "tool %d is not in use", tool_id); PyErr_Format(PyExc_ValueError, "tool %d is not in use", tool_id);
return -1; return -1;
} }