Skip to content

gh-125286: Share the Main Refchain With Legacy Interpreters #125709

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
ericsnowcurrently merged 16 commits into from
Oct 23, 2024
Merged

gh-125286: Share the Main Refchain With Legacy Interpreters #125709

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
53cfb82
Share the main refchain with legacy interpreters.
ericsnowcurrently Oct 18, 2024
b2bf609
Add a has_own_refchain() helper function.
ericsnowcurrently Oct 18, 2024
203c112
Drop _Py_NormalizeImmortalReference().
ericsnowcurrently Oct 21, 2024
ffe2633
Drop has_own_refchain() calls where not needed.
ericsnowcurrently Oct 21, 2024
8d52258
Call _PyObject_InitState() *after* computing the feature flags.
ericsnowcurrently Oct 21, 2024
216dde2
Revert "Call _PyObject_InitState() *after* computing the feature flags."
ericsnowcurrently Oct 21, 2024
fbc4e2d
Revert "Drop has_own_refchain() calls where not needed."
ericsnowcurrently Oct 21, 2024
cb06847
has_own_refchain() -> maybe_fix_refchain()
ericsnowcurrently Oct 21, 2024
7aa33a9
Handle late runtime fini correctly.
ericsnowcurrently Oct 21, 2024
3421a19
Pass the interpreter config to init_interpreter().
ericsnowcurrently Oct 22, 2024
b276454
Revert "Pass the interpreter config to init_interpreter()."
ericsnowcurrently Oct 22, 2024
7ab086c
Move the _PyObject_InitState() call out of init_interpreter().
ericsnowcurrently Oct 22, 2024
9d539f6
Add docs and a What's New entry
encukou Oct 22, 2024
d80fe6a
Fix typos.
ericsnowcurrently Oct 22, 2024
1360d86
Do not try to destroy the refchain if it is NULL.
ericsnowcurrently Oct 22, 2024
090b528
Docs: Link to the new sys.getobjects() docs
encukou Oct 23, 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
Next Next commit
Revert "Drop has_own_refchain() calls where not needed." 
This reverts commit ffe2633.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 21, 2024
commit fbc4e2dac0eb27adac50cee1c7fb60ab33fc0817
18 changes: 18 additions & 0 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,19 @@ refchain_fini(PyInterpreterState *interp)
bool
_PyRefchain_IsTraced(PyInterpreterState *interp, PyObject *obj)
{
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
return (_Py_hashtable_get(REFCHAIN(interp), obj) == REFCHAIN_VALUE);
}


static void
_PyRefchain_Trace(PyInterpreterState *interp, PyObject *obj)
{
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
if (_Py_hashtable_set(REFCHAIN(interp), obj, REFCHAIN_VALUE) < 0) {
// Use a fatal error because _Py_NewReference() cannot report
// the error to the caller.
Expand All @@ -233,6 +239,9 @@ _PyRefchain_Trace(PyInterpreterState *interp, PyObject *obj)
static void
_PyRefchain_Remove(PyInterpreterState *interp, PyObject *obj)
{
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
void *value = _Py_hashtable_steal(REFCHAIN(interp), obj);
#ifndef NDEBUG
assert(value == REFCHAIN_VALUE);
Expand Down Expand Up @@ -2578,6 +2587,9 @@ _Py_PrintReferences(PyInterpreterState *interp, FILE *fp)
interp = _PyInterpreterState_Main();
}
fprintf(fp, "Remaining objects:\n");
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
_Py_hashtable_foreach(REFCHAIN(interp), _Py_PrintReference, fp);
}

Expand Down Expand Up @@ -2606,6 +2618,9 @@ void
_Py_PrintReferenceAddresses(PyInterpreterState *interp, FILE *fp)
{
fprintf(fp, "Remaining object addresses:\n");
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
_Py_hashtable_foreach(REFCHAIN(interp), _Py_PrintReferenceAddress, fp);
}

Expand Down Expand Up @@ -2685,6 +2700,9 @@ _Py_GetObjects(PyObject *self, PyObject *args)
.limit = limit,
};
PyInterpreterState *interp = _PyInterpreterState_GET();
if (!has_own_refchain(interp)) {
interp = _PyInterpreterState_Main();
}
int res = _Py_hashtable_foreach(REFCHAIN(interp), _Py_GetObject, &data);
if (res == _PY_GETOBJECTS_ERROR) {
Py_DECREF(list);
Expand Down