gh-112075: Add try-incref functions from nogil branch for use in dict thread safety #114512
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DinoV
force-pushed
the
nogil_tryincref
branch
4 times, most recently
from
9318df9 to
818fc5f
Compare
colesbury
reviewed
Jan 24, 2024
Include/internal/pycore_object.h
Outdated
|
|
||
| /* Tries to incref the object op and ensures that *src still points to it. */ | ||
| static inline int | ||
| _Py_TryAcquireObject(PyObject **src, PyObject *op) |
Contributor
There was a problem hiding this comment.
I don't love this name, but I don't know what it should be called.
Contributor
Author
There was a problem hiding this comment.
I don't really have a better name either :P
Contributor
There was a problem hiding this comment.
Maybe just _Py_TryIncref()? Also maybe rename src to ptr for consistency with the other functions here.
DinoV
force-pushed
the
nogil_tryincref
branch
from
818fc5f to
3e50cbe
Compare
colesbury
approved these changes
Jan 24, 2024
Contributor
colesbury
left a comment
colesbury
left a comment
There was a problem hiding this comment.
A few minor suggestions, but otherwise LGTM.
Include/internal/pycore_object.h
Outdated
|
|
||
| /* Tries to incref the object op and ensures that *src still points to it. */ | ||
| static inline int | ||
| _Py_TryAcquireObject(PyObject **src, PyObject *op) |
Contributor
There was a problem hiding this comment.
Maybe just _Py_TryIncref()? Also maybe rename src to ptr for consistency with the other functions here.
DinoV
force-pushed
the
nogil_tryincref
branch
from
3e50cbe to
d5fe7a1
Compare
colesbury/nogil@b6b12a9a94e Co-Authored-By: Sam Gross <[email protected]>
DinoV
force-pushed
the
nogil_tryincref
branch
from
d5fe7a1 to
87e9465
Compare
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
…n dict thread safety (python#114512) * Bring in a subset of biased reference counting: colesbury/nogil@b6b12a9a94e The NoGIL branch has functions for attempting to do an incref on an object which may or may not be in flight. This just brings those functions over so that they will be usable from in the dict implementation to get items w/o holding a lock. There's a handful of small simple modifications: Adding inline to the force inline functions to avoid a warning, and switching from _Py_ALWAYS_INLINE to Py_ALWAYS_INLINE as that's available Remove _Py_REF_LOCAL_SHIFT as it doesn't exist yet (and is currently 0 in the 3.12 nogil branch anyway) ob_ref_shared is currently Py_ssize_t and not uint32_t, so use that _PY_LIKELY doesn't exist, so drop it _Py_ThreadLocal becomes _Py_IsOwnedByCurrentThread Add '_PyInterpreterState_GET()' to _Py_IncRefTotal calls. Co-Authored-By: Sam Gross <[email protected]>
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
…n dict thread safety (python#114512) * Bring in a subset of biased reference counting: colesbury/nogil@b6b12a9a94e The NoGIL branch has functions for attempting to do an incref on an object which may or may not be in flight. This just brings those functions over so that they will be usable from in the dict implementation to get items w/o holding a lock. There's a handful of small simple modifications: Adding inline to the force inline functions to avoid a warning, and switching from _Py_ALWAYS_INLINE to Py_ALWAYS_INLINE as that's available Remove _Py_REF_LOCAL_SHIFT as it doesn't exist yet (and is currently 0 in the 3.12 nogil branch anyway) ob_ref_shared is currently Py_ssize_t and not uint32_t, so use that _PY_LIKELY doesn't exist, so drop it _Py_ThreadLocal becomes _Py_IsOwnedByCurrentThread Add '_PyInterpreterState_GET()' to _Py_IncRefTotal calls. Co-Authored-By: Sam Gross <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The NoGIL branch has functions for attempting to do an incref on an object which may or may not be in flight. This just brings those functions over so that they will be usable from in the dict implementation to get items w/o holding a lock.
There's a handful of small simple modifications:
inlineto the force inline functions to avoid a warning, and switching from_Py_ALWAYS_INLINEtoPy_ALWAYS_INLINEas that's available_Py_REF_LOCAL_SHIFTas it doesn't exist yet (and is currently 0 in the 3.12 nogil branch anyway)ob_ref_sharedis currentlyPy_ssize_tand not uint32_t, so use that_PY_LIKELYdoesn't exist, so drop it_Py_ThreadLocalbecomes_Py_IsOwnedByCurrentThread_Py_IncRefTotalcalls.dictobjects thread-safe in--disable-gilbuilds #112075