Skip to content

gh-148037: remove critical section from PyCode_Addr2Line #148103

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
kumaraditya303 merged 7 commits into from
Apr 10, 2026
Merged

gh-148037: remove critical section from PyCode_Addr2Line #148103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bd1b49
remove critical section from PyCode_Addr2Line
kumaraditya303 Apr 4, 2026
ea80076
address review
kumaraditya303 Apr 9, 2026
156c6d7
Merge branch 'main' of https://github.com/python/cpython into instrum…
kumaraditya303 Apr 9, 2026
3248964
fix typo
kumaraditya303 Apr 9, 2026
d8acb4a
fix another typo
kumaraditya303 Apr 9, 2026
9771e79
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 9, 2026
f02f543
_PyCoLineInstrumentationData as argument in _Py_Instrumentation_GetLine
kumaraditya303 Apr 9, 2026
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 review
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Apr 9, 2026
commit ea80076c27afa18b579eb4781e8003cacced6070
9 changes: 6 additions & 3 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,9 +1014,12 @@ PyCode_Addr2Line(PyCodeObject *co, int addrq)
if (addrq < 0) {
return co->co_firstlineno;
}
if (FT_ATOMIC_LOAD_PTR_ACQUIRE(co->_co_monitoring) &&
FT_ATOMIC_LOAD_PTR_ACQUIRE(co->_co_monitoring->lines)) {
return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
_PyCoMonitoringData *data = _Py_atomic_load_ptr_acquire(co->_co_monitoring);
if (data) {
_PyCoLineInstrumentationData *lines = _Py_atomic_load_ptr_acquire(data->lines);
if (lines) {
return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated
}
}
assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
PyCodeAddressRange bounds;
Expand Down
4 changes: 2 additions & 2 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,6 @@ initialize_lines(_PyCoLineInstrumentationData *line_data, PyCodeObject *code, in
set_original_opcode(line_data, handler, original_opcode);
}
}
FT_ATOMIC_STORE_PTR_RELEASE(code->_co_monitoring->lines, line_data);
}

static void
Expand Down Expand Up @@ -1667,7 +1666,7 @@ allocate_instrumentation_data(PyCodeObject *code)
monitoring->line_tools = NULL;
monitoring->per_instruction_opcodes = NULL;
monitoring->per_instruction_tools = NULL;
FT_ATOMIC_STORE_PTR_RELEASE(code->_co_monitoring, monitoring);
_Py_atomic_store_ptr_release(code->_co_monitoring, monitoring);
}
return 0;
}
Expand Down Expand Up @@ -1738,6 +1737,7 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
return -1;
}
initialize_lines(lines, code, bytes_per_entry);
Comment thread
kumaraditya303 marked this conversation as resolved.
_Py_atomic_store_ptr_release(code->_co_monitoring->lines, line_data);
}
if (multitools && code->_co_monitoring->line_tools == NULL) {
code->_co_monitoring->line_tools = PyMem_Malloc(code_len);
Expand Down