-
-
Notifications
You must be signed in to change notification settings - Fork 33.2k
gh-129533: Update PyGC_Enable/Disable/IsEnabled to use atomic operation #129563
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.
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
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1f335ca
gh-129533: Update PyGC_Enable/Disable/IsEnabled to use CAS operation
corona10 0624809
fix
corona10 59ff523
nit
corona10 e066958
nit
corona10 8a41f07
Apply suggestions from code review
corona10 6c990f9
Update NEWS.d
corona10 d36c349
Address code review
corona10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/C_API/2025-02-02-12-58-21.gh-issue-129533.dFfqkT.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Update :c:func:`PyGC_Enable()`, :c:func:`PyGC_Disable()`, | ||
| :c:func:`PyGC_IsEnabled()` to use CAS operation for thread-safety at | ||
| free-threading build. Patch by Donghee Na. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1476,7 +1476,8 @@ gc_should_collect(GCState *gcstate) | |
| { | ||
| int count = _Py_atomic_load_int_relaxed(&gcstate->young.count); | ||
| int threshold = gcstate->young.threshold; | ||
| if (count <= threshold || threshold == 0 || !gcstate->enabled) { | ||
| int gc_enabled = _Py_atomic_load_int_relaxed(&gcstate->enabled); | ||
| if (count <= threshold || threshold == 0 || !gc_enabled) { | ||
| return false; | ||
| } | ||
| // Avoid quadratic behavior by scaling threshold to the number of live | ||
|
|
@@ -1952,25 +1953,25 @@ int | |
| PyGC_Enable(void) | ||
| { | ||
| GCState *gcstate = get_gc_state(); | ||
| int old_state = gcstate->enabled; | ||
| gcstate->enabled = 1; | ||
| int old_state = _Py_atomic_load_int_relaxed(&gcstate->enabled); | ||
| while (!_Py_atomic_compare_exchange_int(&gcstate->enabled, &old_state, 1)); | ||
| return old_state; | ||
| } | ||
|
|
||
| int | ||
| PyGC_Disable(void) | ||
| { | ||
| GCState *gcstate = get_gc_state(); | ||
| int old_state = gcstate->enabled; | ||
| gcstate->enabled = 0; | ||
| int old_state = _Py_atomic_load_int_relaxed(&gcstate->enabled); | ||
| while (!_Py_atomic_compare_exchange_int(&gcstate->enabled, &old_state, 0)); | ||
|
||
| return old_state; | ||
| } | ||
|
|
||
| int | ||
| PyGC_IsEnabled(void) | ||
| { | ||
| GCState *gcstate = get_gc_state(); | ||
| return gcstate->enabled; | ||
| return _Py_atomic_load_int_relaxed(&gcstate->enabled); | ||
| } | ||
|
|
||
| /* Public API to invoke gc.collect() from C */ | ||
|
|
@@ -1980,7 +1981,7 @@ PyGC_Collect(void) | |
| PyThreadState *tstate = _PyThreadState_GET(); | ||
| GCState *gcstate = &tstate->interp->gc; | ||
|
|
||
| if (!gcstate->enabled) { | ||
| if (!_Py_atomic_load_int_relaxed(&gcstate->enabled)) { | ||
| return 0; | ||
| } | ||
|
|
||
|
|
@@ -2139,8 +2140,7 @@ _PyObject_GC_Link(PyObject *op) | |
| void | ||
| _Py_RunGC(PyThreadState *tstate) | ||
| { | ||
| GCState *gcstate = get_gc_state(); | ||
| if (!gcstate->enabled) { | ||
| if (!PyGC_IsEnabled()) { | ||
| return; | ||
| } | ||
| gc_collect_main(tstate, 0, _Py_GC_REASON_HEAP); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.