Skip to content

Commit d3b7b93

Browse files
kumaraditya303kumaraditya303
authored
gh-148037: remove critical section from PyCode_Addr2Line (#148103)
1 parent 1a0edb1 commit d3b7b93

File tree

5 files changed

+33
-42
lines changed

5 files changed

+33
-42
lines changed

‎Include/internal/pycore_instruments.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ PyAPI_FUNC(void)
6464
_Py_call_instrumentation_exc2(PyThreadState *tstate, int event,
6565
_PyInterpreterFrame *frame, _Py_CODEUNIT *instr, PyObject *arg0, PyObject *arg1);
6666

67-
extern int
68-
_Py_Instrumentation_GetLine(PyCodeObject *code, int index);
69-
7067
PyAPI_DATA(PyObject) _PyInstrumentation_MISSING;
7168
PyAPI_DATA(PyObject) _PyInstrumentation_DISABLE;
7269

@@ -122,6 +119,8 @@ typedef struct _PyCoMonitoringData {
122119
uint8_t *per_instruction_tools;
123120
} _PyCoMonitoringData;
124121

122+
extern int
123+
_Py_Instrumentation_GetLine(PyCodeObject *code, _PyCoLineInstrumentationData *line_data, int index);
125124

126125
#ifdef __cplusplus
127126
}

‎Misc/NEWS.d/next/Core_and_Builtins/2026-04-09-14-18-33.gh-issue-148037.aP3CSX.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove critical section from :c:func:`!PyCode_Addr2Line` in free-threading.

‎Objects/codeobject.c‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,14 +1008,18 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
10081008
* source location tracking (co_lines/co_positions)
10091009
******************/
10101010

1011-
static int
1012-
_PyCode_Addr2Line(PyCodeObject *co, int addrq)
1011+
int
1012+
PyCode_Addr2Line(PyCodeObject *co, int addrq)
10131013
{
10141014
if (addrq < 0) {
10151015
return co->co_firstlineno;
10161016
}
1017-
if (co->_co_monitoring && co->_co_monitoring->lines) {
1018-
return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
1017+
_PyCoMonitoringData *data = _Py_atomic_load_ptr_acquire(&co->_co_monitoring);
1018+
if (data) {
1019+
_PyCoLineInstrumentationData *lines = _Py_atomic_load_ptr_acquire(&data->lines);
1020+
if (lines) {
1021+
return _Py_Instrumentation_GetLine(co, lines, addrq/sizeof(_Py_CODEUNIT));
1022+
}
10191023
}
10201024
assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
10211025
PyCodeAddressRange bounds;
@@ -1030,7 +1034,7 @@ _PyCode_SafeAddr2Line(PyCodeObject *co, int addrq)
10301034
return co->co_firstlineno;
10311035
}
10321036
if (co->_co_monitoring && co->_co_monitoring->lines) {
1033-
return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
1037+
return _Py_Instrumentation_GetLine(co, co->_co_monitoring->lines, addrq/sizeof(_Py_CODEUNIT));
10341038
}
10351039
if (!(addrq >= 0 && addrq < _PyCode_NBYTES(co))) {
10361040
return -1;
@@ -1040,16 +1044,6 @@ _PyCode_SafeAddr2Line(PyCodeObject *co, int addrq)
10401044
return _PyCode_CheckLineNumber(addrq, &bounds);
10411045
}
10421046

1043-
int
1044-
PyCode_Addr2Line(PyCodeObject *co, int addrq)
1045-
{
1046-
int lineno;
1047-
Py_BEGIN_CRITICAL_SECTION(co);
1048-
lineno = _PyCode_Addr2Line(co, addrq);
1049-
Py_END_CRITICAL_SECTION();
1050-
return lineno;
1051-
}
1052-
10531047
void
10541048
_PyLineTable_InitAddressRange(const char *linetable, Py_ssize_t length, int firstlineno, PyCodeAddressRange *range)
10551049
{

‎Python/instrumentation.c‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,13 +1286,10 @@ _Py_call_instrumentation_exc2(
12861286
}
12871287

12881288
int
1289-
_Py_Instrumentation_GetLine(PyCodeObject *code, int index)
1289+
_Py_Instrumentation_GetLine(PyCodeObject *code, _PyCoLineInstrumentationData *line_data, int index)
12901290
{
1291-
_PyCoMonitoringData *monitoring = code->_co_monitoring;
1292-
assert(monitoring != NULL);
1293-
assert(monitoring->lines != NULL);
1291+
assert(line_data != NULL);
12941292
assert(index < Py_SIZE(code));
1295-
_PyCoLineInstrumentationData *line_data = monitoring->lines;
12961293
int line_delta = get_line_delta(line_data, index);
12971294
int line = compute_line(code, line_delta);
12981295
return line;
@@ -1310,11 +1307,11 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
13101307
_PyCoMonitoringData *monitoring = code->_co_monitoring;
13111308
_PyCoLineInstrumentationData *line_data = monitoring->lines;
13121309
PyInterpreterState *interp = tstate->interp;
1313-
int line = _Py_Instrumentation_GetLine(code, i);
1310+
int line = _Py_Instrumentation_GetLine(code, line_data, i);
13141311
assert(line >= 0);
13151312
assert(prev != NULL);
13161313
int prev_index = (int)(prev - bytecode);
1317-
int prev_line = _Py_Instrumentation_GetLine(code, prev_index);
1314+
int prev_line = _Py_Instrumentation_GetLine(code, line_data, prev_index);
13181315
if (prev_line == line) {
13191316
int prev_opcode = bytecode[prev_index].op.code;
13201317
/* RESUME and INSTRUMENTED_RESUME are needed for the operation of
@@ -1511,11 +1508,9 @@ initialize_tools(PyCodeObject *code)
15111508
}
15121509

15131510
static void
1514-
initialize_lines(PyCodeObject *code, int bytes_per_entry)
1511+
initialize_lines(_PyCoLineInstrumentationData *line_data, PyCodeObject *code, int bytes_per_entry)
15151512
{
15161513
ASSERT_WORLD_STOPPED_OR_LOCKED(code);
1517-
_PyCoLineInstrumentationData *line_data = code->_co_monitoring->lines;
1518-
15191514
assert(line_data != NULL);
15201515
line_data->bytes_per_entry = bytes_per_entry;
15211516
int code_len = (int)Py_SIZE(code);
@@ -1656,18 +1651,19 @@ allocate_instrumentation_data(PyCodeObject *code)
16561651
ASSERT_WORLD_STOPPED_OR_LOCKED(code);
16571652

16581653
if (code->_co_monitoring == NULL) {
1659-
code->_co_monitoring = PyMem_Malloc(sizeof(_PyCoMonitoringData));
1660-
if (code->_co_monitoring == NULL) {
1654+
_PyCoMonitoringData *monitoring = PyMem_Malloc(sizeof(_PyCoMonitoringData));
1655+
if (monitoring == NULL) {
16611656
PyErr_NoMemory();
16621657
return -1;
16631658
}
1664-
code->_co_monitoring->local_monitors = (_Py_LocalMonitors){ 0 };
1665-
code->_co_monitoring->active_monitors = (_Py_LocalMonitors){ 0 };
1666-
code->_co_monitoring->tools = NULL;
1667-
code->_co_monitoring->lines = NULL;
1668-
code->_co_monitoring->line_tools = NULL;
1669-
code->_co_monitoring->per_instruction_opcodes = NULL;
1670-
code->_co_monitoring->per_instruction_tools = NULL;
1659+
monitoring->local_monitors = (_Py_LocalMonitors){ 0 };
1660+
monitoring->active_monitors = (_Py_LocalMonitors){ 0 };
1661+
monitoring->tools = NULL;
1662+
monitoring->lines = NULL;
1663+
monitoring->line_tools = NULL;
1664+
monitoring->per_instruction_opcodes = NULL;
1665+
monitoring->per_instruction_tools = NULL;
1666+
_Py_atomic_store_ptr_release(&code->_co_monitoring, monitoring);
16711667
}
16721668
return 0;
16731669
}
@@ -1732,12 +1728,13 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
17321728
else {
17331729
bytes_per_entry = 5;
17341730
}
1735-
code->_co_monitoring->lines = PyMem_Malloc(1 + code_len * bytes_per_entry);
1736-
if (code->_co_monitoring->lines == NULL) {
1731+
_PyCoLineInstrumentationData *lines = PyMem_Malloc(1 + code_len * bytes_per_entry);
1732+
if (lines == NULL) {
17371733
PyErr_NoMemory();
17381734
return -1;
17391735
}
1740-
initialize_lines(code, bytes_per_entry);
1736+
initialize_lines(lines, code, bytes_per_entry);
1737+
_Py_atomic_store_ptr_release(&code->_co_monitoring->lines, lines);
17411738
}
17421739
if (multitools && code->_co_monitoring->line_tools == NULL) {
17431740
code->_co_monitoring->line_tools = PyMem_Malloc(code_len);

‎Python/legacy_tracing.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ sys_trace_jump_func(
391391
assert(PyCode_Check(code));
392392
/* We can call _Py_Instrumentation_GetLine because we always set
393393
* line events for tracing */
394-
int to_line = _Py_Instrumentation_GetLine(code, to);
395-
int from_line = _Py_Instrumentation_GetLine(code, from);
394+
int to_line = _Py_Instrumentation_GetLine(code, code->_co_monitoring->lines, to);
395+
int from_line = _Py_Instrumentation_GetLine(code, code->_co_monitoring->lines, from);
396396
if (to_line != from_line) {
397397
/* Will be handled by target INSTRUMENTED_LINE */
398398
return &_PyInstrumentation_DISABLE;

0 commit comments

Comments
 (0)