Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-112075: Add try-incref functions from nogil branch for use in dict thread safety#114512

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
DinoV merged 3 commits intopython:mainfromDinoV:nogil_tryincref
Jan 25, 2024

Conversation

DinoV
Copy link
Contributor

@DinoVDinoV commentedJan 24, 2024•
edited
Loading

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:

  1. Addinginline to the force inline functions to avoid a warning, and switching from_Py_ALWAYS_INLINE toPy_ALWAYS_INLINE as that's available
  2. Remove_Py_REF_LOCAL_SHIFT as it doesn't exist yet (and is currently 0 in the 3.12 nogil branch anyway)
  3. ob_ref_shared is currentlyPy_ssize_t and not uint32_t, so use that
  4. _PY_LIKELY doesn't exist, so drop it
  5. _Py_ThreadLocal becomes_Py_IsOwnedByCurrentThread
  6. Add '_PyInterpreterState_GET()' to_Py_IncRefTotal calls.


/* Tries to incref the object op and ensures that *src still points to it. */
static inline int
_Py_TryAcquireObject(PyObject **src, PyObject *op)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I don't love this name, but I don't know what it should be called.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I don't really have a better name either :P

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Maybe just_Py_TryIncref()? Also maybe renamesrc toptr for consistency with the other functions here.

DinoV reacted with thumbs up emoji
Copy link
Contributor

@colesburycolesbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

A few minor suggestions, but otherwise LGTM.


/* Tries to incref the object op and ensures that *src still points to it. */
static inline int
_Py_TryAcquireObject(PyObject **src, PyObject *op)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Maybe just_Py_TryIncref()? Also maybe renamesrc toptr for consistency with the other functions here.

DinoV reacted with thumbs up emoji
@DinoVDinoV merged commit4850410 intopython:mainJan 25, 2024
aisk pushed a commit to aisk/cpython that referenced this pull requestFeb 11, 2024
…n dict thread safety (python#114512)* Bring in a subset of biased reference counting:colesbury/nogil@b6b12a9a94eThe 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 <colesbury@gmail.com>
Glyphack pushed a commit to Glyphack/cpython that referenced this pull requestSep 2, 2024
…n dict thread safety (python#114512)* Bring in a subset of biased reference counting:colesbury/nogil@b6b12a9a94eThe 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 <colesbury@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@colesburycolesburycolesbury approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2 participants
@DinoV@colesbury
[8]ページ先頭
©2009-2025 Movatter.jp