Skip to content

gh-117657: Use an atomic store to set type flags. #127588

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
nascheme merged 4 commits into from
Feb 26, 2025
Merged

gh-117657: Use an atomic store to set type flags. #127588

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc26f92
Use an atomic store to set type flags.
nascheme Dec 3, 2024
3c67c79
Simplify `type_set_flags()` function.
nascheme Dec 4, 2024
0fe7d78
Add type lock held assert to `type_set_flags()`.
nascheme Dec 4, 2024
4984eb7
Merge 'origin/main' into gh-117657-tp-flags-set-atomic
nascheme Feb 26, 2025
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
Merge 'origin/main' into gh-117657-tp-flags-set-atomic
  • Loading branch information
@nascheme
nascheme committed Feb 26, 2025
commit 4984eb72981278af2a8f18e3373328faa4c32b5b
25 changes: 25 additions & 0 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5751,6 +5751,31 @@ _PyType_CacheInitForSpecialization(PyHeapTypeObject *type, PyObject *init,
return can_cache;
}

int
_PyType_CacheGetItemForSpecialization(PyHeapTypeObject *ht, PyObject *descriptor, uint32_t tp_version)
{
if (!descriptor || !tp_version) {
return 0;
}
int can_cache;
BEGIN_TYPE_LOCK();
can_cache = ((PyTypeObject*)ht)->tp_version_tag == tp_version;
// This pointer is invalidated by PyType_Modified (see the comment on
// struct _specialization_cache):
PyFunctionObject *func = (PyFunctionObject *)descriptor;
uint32_t version = _PyFunction_GetVersionForCurrentState(func);
can_cache = can_cache && _PyFunction_IsVersionValid(version);
#ifdef Py_GIL_DISABLED
can_cache = can_cache && _PyObject_HasDeferredRefcount(descriptor);
#endif
if (can_cache) {
FT_ATOMIC_STORE_PTR_RELEASE(ht->_spec_cache.getitem, descriptor);
FT_ATOMIC_STORE_UINT32_RELAXED(ht->_spec_cache.getitem_version, version);
}
END_TYPE_LOCK();
return can_cache;
}

void
_PyType_SetFlags(PyTypeObject *self, unsigned long mask, unsigned long flags)
{
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.