mirror of
https://github.com/python/cpython.git
synced 2025-07-16 15:55:18 +00:00
gh-117439: Make refleak checking thread-safe without the GIL (#117469)
This keeps track of the per-thread total reference count operations in PyThreadState in the free-threaded builds. The count is merged into the interpreter's total when the thread exits.
This commit is contained in:
parent
2067da2579
commit
1a6594f661
9 changed files with 62 additions and 44 deletions
|
@ -168,7 +168,7 @@ merge_refcount(PyObject *op, Py_ssize_t extra)
|
|||
refcount += extra;
|
||||
|
||||
#ifdef Py_REF_DEBUG
|
||||
_Py_AddRefTotal(_PyInterpreterState_GET(), extra);
|
||||
_Py_AddRefTotal(_PyThreadState_GET(), extra);
|
||||
#endif
|
||||
|
||||
// No atomics necessary; all other threads in this interpreter are paused.
|
||||
|
@ -307,7 +307,7 @@ merge_queued_objects(_PyThreadStateImpl *tstate, struct collection_state *state)
|
|||
// decref and deallocate the object once we start the world again.
|
||||
op->ob_ref_shared += (1 << _Py_REF_SHARED_SHIFT);
|
||||
#ifdef Py_REF_DEBUG
|
||||
_Py_IncRefTotal(_PyInterpreterState_GET());
|
||||
_Py_IncRefTotal(_PyThreadState_GET());
|
||||
#endif
|
||||
worklist_push(&state->objs_to_decref, op);
|
||||
}
|
||||
|
|
|
@ -1698,6 +1698,14 @@ tstate_delete_common(PyThreadState *tstate)
|
|||
decrement_stoptheworld_countdown(&runtime->stoptheworld);
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(Py_REF_DEBUG) && defined(Py_GIL_DISABLED)
|
||||
// Add our portion of the total refcount to the interpreter's total.
|
||||
_PyThreadStateImpl *tstate_impl = (_PyThreadStateImpl *)tstate;
|
||||
tstate->interp->object_state.reftotal += tstate_impl->reftotal;
|
||||
tstate_impl->reftotal = 0;
|
||||
#endif
|
||||
|
||||
HEAD_UNLOCK(runtime);
|
||||
|
||||
#ifdef Py_GIL_DISABLED
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue