Skip to content

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.

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
DinoV merged 3 commits into from
Jan 25, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39c251e
Bring in a subset of biased reference counting:
DinoV Jan 24, 2024
a923bc9
Review feedback
DinoV Jan 24, 2024
87e9465
More renames
DinoV Jan 25, 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
More renames
  • Loading branch information
@DinoV
DinoV committed Jan 25, 2024
commit 87e94657436bc27a9d6eea6255465e3898bf72d3
9 changes: 4 additions & 5 deletions Include/internal/pycore_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ _Py_TryIncRefShared(PyObject *op)

/* Tries to incref the object op and ensures that *src still points to it. */
static inline int
_Py_TryAcquireObject(PyObject **src, PyObject *op)
_Py_TryIncref(PyObject **src, PyObject *op)
{
if (_Py_TryIncrefFast(op)) {
return 1;
Expand All @@ -456,7 +456,7 @@ _Py_XGetRef(PyObject **ptr)
if (value == NULL) {
return value;
}
if (_Py_TryAcquireObject(ptr, value)) {
if (_Py_TryIncref(ptr, value)) {
return value;
}
}
Expand All @@ -465,13 +465,13 @@ _Py_XGetRef(PyObject **ptr)
/* Attempts to loads and increfs an object from ptr. Returns NULL
on failure, which may be due to a NULL value or a concurrent update. */
static inline PyObject *
_Py_TryXFetchRef(PyObject **ptr)
_Py_TryXGetRef(PyObject **ptr)
{
PyObject *value = _Py_atomic_load_ptr(ptr);
if (value == NULL) {
return value;
}
if (_Py_TryAcquireObject(ptr, value)) {
if (_Py_TryIncref(ptr, value)) {
return value;
}
return NULL;
Expand Down Expand Up @@ -499,7 +499,6 @@ _Py_NewRefWithLock(PyObject *op)
return op;
}
}
return op;
}

static inline PyObject *
Expand Down