Skip to content

gh-117657: Fix some simple races in instrumentation.c #120118

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 3 commits into from
Jun 13, 2024
+2 −2
Merged

gh-117657: Fix some simple races in instrumentation.c #120118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa40c72
Fix some simple races in instrumentation.c
Fidget-Spinner Jun 5, 2024
43cc08a
Revert "Fix some simple races in instrumentation.c"
Fidget-Spinner Jun 7, 2024
124ad7f
stop the world when setting local events
Fidget-Spinner Jun 7, 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
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 @@ -1977,7 +1977,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
}

int res;
LOCK_CODE(code);
_PyEval_StopTheWorld(interp);
if (allocate_instrumentation_data(code)) {
res = -1;
goto done;
Expand All @@ -1994,7 +1994,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
res = force_instrument_lock_held(code, interp);

done:
UNLOCK_CODE();
_PyEval_StartTheWorld(interp);
return res;
}

Expand Down
Loading