mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-132917: fix data race on last_mem in free-threading gc (#134692)

Browse source
This commit is contained in:
Kumar Aditya 2025-05-27 22:42:08 +05:30 • committed by GitHub
parent a380d57873
commit ac539e7e0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/gc_free_threading.c
View file

@ -2062,7 +2062,7 @@ gc_should_collect_mem_usage(GCState *gcstate)
// 70,000 new container objects. // 70,000 new container objects.
return true; return true;
} }
Py_ssize_t last_mem = gcstate->last_mem; Py_ssize_t last_mem = _Py_atomic_load_ssize_relaxed(&gcstate->last_mem);
Py_ssize_t mem_threshold = Py_MAX(last_mem / 10, 128); Py_ssize_t mem_threshold = Py_MAX(last_mem / 10, 128);
if ((mem - last_mem) > mem_threshold) { if ((mem - last_mem) > mem_threshold) {
// The process memory usage has increased too much, do a collection. // The process memory usage has increased too much, do a collection.
@ -2245,7 +2245,8 @@ gc_collect_internal(PyInterpreterState *interp, struct collection_state *state,
// Store the current memory usage, can be smaller now if breaking cycles // Store the current memory usage, can be smaller now if breaking cycles
// freed some memory. // freed some memory.
state->gcstate->last_mem = get_process_mem_usage(); Py_ssize_t last_mem = get_process_mem_usage();
_Py_atomic_store_ssize_relaxed(&state->gcstate->last_mem, last_mem);
// Append objects with legacy finalizers to the "gc.garbage" list. // Append objects with legacy finalizers to the "gc.garbage" list.
handle_legacy_finalizers(state); handle_legacy_finalizers(state);