https://github.com/python/cpython/commit/f7af8bc58aaa0c76028ddee54e635daedcd1b40c
commit: f7af8bc58aaa0c76028ddee54e635daedcd1b40c
branch: 3.13
author: Donghee Na <[email protected]>
committer: corona10 <[email protected]>
date: 2025-02-06T23:11:17Z
summary:
[3.13] gh-129533: Update PyGC_Enable/Disable/IsEnabled to use atomic operat…
(gh-129756)
gh-129533: Update PyGC_Enable/Disable/IsEnabled to use atomic operation
(gh-129563)
(cherry picked from commit b184abf074c0e1f379a238f07da5616460f36b93)
files:
A Misc/NEWS.d/next/C API/2025-02-02-12-58-21.gh-issue-129533.dFfqkT.rst
M Python/gc_free_threading.c
diff --git a/Misc/NEWS.d/next/C
API/2025-02-02-12-58-21.gh-issue-129533.dFfqkT.rst b/Misc/NEWS.d/next/C
API/2025-02-02-12-58-21.gh-issue-129533.dFfqkT.rst
new file mode 100644
index 00000000000000..20e93e2bcc1f47
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2025-02-02-12-58-21.gh-issue-129533.dFfqkT.rst
@@ -0,0 +1,3 @@
+Update :c:func:`PyGC_Enable()`, :c:func:`PyGC_Disable()`,
+:c:func:`PyGC_IsEnabled()` to use atomic operation for thread-safety
+at free-threading build. Patch by Donghee Na.
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
index ff86c759eb2c1c..6a38cc224a4bf8 100644
--- a/Python/gc_free_threading.c
+++ b/Python/gc_free_threading.c
@@ -1059,7 +1059,8 @@ gc_should_collect(GCState *gcstate)
{
int count = _Py_atomic_load_int_relaxed(&gcstate->generations[0].count);
int threshold = gcstate->generations[0].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
@@ -1495,25 +1496,21 @@ int
PyGC_Enable(void)
{
GCState *gcstate = get_gc_state();
- int old_state = gcstate->enabled;
- gcstate->enabled = 1;
- return old_state;
+ return _Py_atomic_exchange_int(&gcstate->enabled, 1);
}
int
PyGC_Disable(void)
{
GCState *gcstate = get_gc_state();
- int old_state = gcstate->enabled;
- gcstate->enabled = 0;
- return old_state;
+ return _Py_atomic_exchange_int(&gcstate->enabled, 0);
}
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 */
@@ -1523,7 +1520,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;
}
@@ -1681,8 +1678,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);
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
