Skip to content

gh-115103: Update gc.collect to process delayed objects #116251

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
corona10 merged 2 commits into from
Mar 2, 2024
+0 −0
Merged

gh-115103: Update gc.collect to process delayed objects #116251

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f19393
Revert "gh-115103: Update refleak checker to trigger _PyMem_ProcessDe…
corona10 Mar 2, 2024
df1096f
gh-115103: Update gc.collect to process delayed objects
corona10 Mar 2, 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
Prev Previous commit
gh-115103: Update gc.collect to process delayed objects
  • Loading branch information
@corona10
corona10 committed Mar 2, 2024
commit df1096f5b4ff842bce25a8afe82e83454fc2a6dd
18 changes: 18 additions & 0 deletions Python/gc_free_threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,23 @@ merge_all_queued_objects(PyInterpreterState *interp, struct collection_state *st
HEAD_UNLOCK(&_PyRuntime);
}

static void
process_delayed_frees(PyInterpreterState *interp)
{
// In STW status, we can observe the latest write sequence by
// advancing the write sequence immediately.
_Py_qsbr_advance(&interp->qsbr);
_PyThreadStateImpl *current_tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
_Py_qsbr_quiescent_state(current_tstate->qsbr);
HEAD_LOCK(&_PyRuntime);
PyThreadState *tstate = interp->threads.head;
while (tstate != NULL) {
_PyMem_ProcessDelayed(tstate);
tstate = (PyThreadState *)tstate->next;
}
HEAD_UNLOCK(&_PyRuntime);
}

// Subtract an incoming reference from the computed "gc_refs" refcount.
static int
visit_decref(PyObject *op, void *arg)
Expand Down Expand Up @@ -1006,6 +1023,7 @@ gc_collect_internal(PyInterpreterState *interp, struct collection_state *state)
_PyEval_StopTheWorld(interp);
// merge refcounts for all queued objects
merge_all_queued_objects(interp, state);
process_delayed_frees(interp);

// Find unreachable objects
int err = deduce_unreachable_heap(interp, state);
Expand Down