Skip to content

gh-137400: Fix thread-safety issues when profiling all threads #137518

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
colesbury merged 10 commits into from
Aug 13, 2025
Merged

gh-137400: Fix thread-safety issues when profiling all threads #137518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bcb2772
gh-137400: Fix a thread-safety issues when profiling all threads
colesbury Aug 6, 2025
09b28c8
Add blurb
colesbury Aug 7, 2025
468b8fe
Fix error handling
colesbury Aug 7, 2025
e79ed43
Merge branch 'main' into gh-137400-now-with-fewer-crashes
colesbury Aug 7, 2025
e8ab41d
Fix another race with tracing
colesbury Aug 7, 2025
a1d8760
Merge branch 'main' into gh-137400-now-with-fewer-crashes
colesbury Aug 11, 2025
03ec62c
Changes from review
colesbury Aug 11, 2025
1b613bd
Update Python/legacy_tracing.c
colesbury Aug 11, 2025
0f7e62d
Changes from review
colesbury Aug 11, 2025
9225c9a
Update Python/legacy_tracing.c
colesbury Aug 12, 2025
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
Changes from review
  • Loading branch information
@colesbury
colesbury committed Aug 11, 2025
commit 03ec62c2cac784996afbdc2c2180cb8ad9671acd
8 changes: 2 additions & 6 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,9 +2510,7 @@ PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
void
PyEval_SetProfileAllThreads(Py_tracefunc func, PyObject *arg)
{
PyThreadState *this_tstate = _PyThreadState_GET();
PyInterpreterState* interp = this_tstate->interp;

PyInterpreterState *interp = _PyInterpreterState_GET();
if (_PyEval_SetProfileAllThreads(interp, func, arg) < 0) {
/* Log _PySys_Audit() error */
PyErr_FormatUnraisable("Exception ignored in PyEval_SetProfileAllThreads");
Expand All @@ -2532,9 +2530,7 @@ PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
void
PyEval_SetTraceAllThreads(Py_tracefunc func, PyObject *arg)
{
PyThreadState *this_tstate = _PyThreadState_GET();
PyInterpreterState* interp = this_tstate->interp;

PyInterpreterState *interp = _PyInterpreterState_GET();
if (_PyEval_SetTraceAllThreads(interp, func, arg) < 0) {
/* Log _PySys_Audit() error */
PyErr_FormatUnraisable("Exception ignored in PyEval_SetTraceAllThreads");
Expand Down
8 changes: 2 additions & 6 deletions Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,10 +1946,7 @@ instrument_all_executing_code_objects(PyInterpreterState *interp)
ASSERT_WORLD_STOPPED();

int err = 0;
_PyRuntimeState *runtime = &_PyRuntime;
HEAD_LOCK(runtime);
PyThreadState *ts = PyInterpreterState_ThreadHead(interp);
while (ts) {
_Py_FOR_EACH_TSTATE_BEGIN(interp, ts) {
_PyInterpreterFrame *frame = ts->current_frame;
while (frame) {
if (frame->owner < FRAME_OWNED_BY_INTERPRETER) {
Expand All @@ -1960,10 +1957,9 @@ instrument_all_executing_code_objects(PyInterpreterState *interp)
}
frame = frame->previous;
}
ts = PyThreadState_Next(ts);
}
done:
HEAD_UNLOCK(runtime);
_Py_FOR_EACH_TSTATE_END(interp);
return err;
}

Expand Down
Loading