-
-
Notifications
You must be signed in to change notification settings - Fork 32.1k
gh-133931: Introduce _PyObject_XSetRefDelayed to replace Py_XSETREF #134377
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.
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
base: main
Are you sure you want to change the base?
Conversation
Objects/obmalloc.c
Outdated
_PyObject_XSetRefDelayed(PyObject **ptr, PyObject *value) | ||
{ | ||
PyObject *old = *ptr; | ||
FT_ATOMIC_STORE_PTR_RELEASE(*ptr, Py_NewRef(value)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default build implementation in pycore_pymem.h
doesn't include the Py_NewRef()
.
My preference is to keep the Py_NewRef(value)
in the callers, i.e.:
_PyObject_XSetRefDelayed(dictptr, Py_NewRef(value));
to match the semantics of Py_XSETREF
.
Interesting... CI passed in my local but not in the CI.. :( |
Ah okay..
|
Why do we need Also, what is "delayed"? Either choose a clearer name, or add an explanatory comment in the header file. |
IIUC, the critical section is for the root object to prevent other threads from mutating the child object, and a delayed reference to prevent use-after-free from other threads that reference the child object. |
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
Include/internal/pycore_pymem.h
Outdated
@@ -100,6 +100,18 @@ static inline void _PyObject_XDecRefDelayed(PyObject *obj) | |||
} | |||
#endif | |||
|
|||
#ifdef Py_GIL_DISABLED | |||
// This is the delayed-free equivalent of Py_XSETREF(), providing the same |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this sounds opposite, _PyObject_XSetRefDelayed
is the delayed version whereas Py_XSETREF
is the delayed free equivalent
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for catching
Co-authored-by: Kumar Aditya <kumaraditya@python.org>
Objects/obmalloc.c
Outdated
_PyObject_XDecRefDelayed(old); | ||
} | ||
else { | ||
Py_DECREF(old); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if the object is immortal then decref has no effect
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah but it tracks the stat. I am not sure we need this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lines 375 to 378 in 598aa7c
if (local == _Py_IMMORTAL_REFCNT_LOCAL) { | |
_Py_DECREF_IMMORTAL_STAT_INC(); | |
return; | |
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But let's remove it, unitil we need this stat explicitly.
Co-authored-by: Victor Stinner <vstinner@python.org>
Could someone please explain to me, why Line 7381 in 598aa7c
Which one is more correct? |
gen_set_name
andgen_set_qualname
thread-safe in free-threaded builds #133931