-
-
Notifications
You must be signed in to change notification settings - Fork 32.5k
gh-128844: Make _Py_TryIncref
public as an unstable API.
#128926
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
d7e458c
gh-128844: Make `_Py_TryIncref` public as an unstable API.
colesbury 12ea212
Fix doc
colesbury 2e18b45
Ignore global variables in test code
colesbury cba2d54
Remove incomplete sentence from docs
colesbury 31d0548
Fix return type in docs
colesbury 9ec47b3
Reset MyObject_dealloc_called at start of test_py_try_inc_ref
colesbury 8e53a2e
Fixup comment
colesbury 37a08dc
s/unowned/borrowed
colesbury 405952c
Add an example sketch from Petr Viktorin
encukou cac2eb4
Add PyUnstable_EnableTryIncRef to the example
encukou 887ab77
Add locking to add_entry
colesbury 95cad2d
Merge branch 'main' into gh-1288440-try-incref
colesbury 4a87acb
Update Doc/c-api/object.rst
colesbury 4161242
Merge branch 'main' into gh-1288440-try-incref
colesbury File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/C_API/2025-01-16-21-56-49.gh-issue-128844.ZPiJuo.rst
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Add :c:func:`PyUnstable_TryIncRef` and :c:func:`PyUnstable_EnableTryIncRef` | ||
unstable APIs. These are helpers for dealing with unowned references in | ||
a thread-safe way, particularly in the free threading build. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,13 +131,66 @@ pyobject_enable_deferred_refcount(PyObject *self, PyObject *obj) | |
return PyLong_FromLong(result); | ||
} | ||
|
||
static int MyObject_dealloc_called = 0; | ||
|
||
static void | ||
MyObject_dealloc(PyObject *op) | ||
{ | ||
// PyUnstable_TryIncRef should return 0 if object is being deallocated | ||
assert(Py_REFCNT(op) == 0); | ||
assert(!PyUnstable_TryIncRef(op)); | ||
assert(Py_REFCNT(op) == 0); | ||
|
||
MyObject_dealloc_called++; | ||
Py_TYPE(op)->tp_free(op); | ||
} | ||
|
||
static PyTypeObject MyType = { | ||
PyVarObject_HEAD_INIT(NULL, 0) | ||
.tp_name = "MyType", | ||
.tp_basicsize = sizeof(PyObject), | ||
.tp_dealloc = MyObject_dealloc, | ||
}; | ||
|
||
static PyObject * | ||
test_py_try_inc_ref(PyObject *self, PyObject *unused) | ||
{ | ||
if (PyType_Ready(&MyType) < 0) { | ||
return NULL; | ||
} | ||
|
||
MyObject_dealloc_called = 0; | ||
|
||
PyObject *op = PyObject_New(PyObject, &MyType); | ||
if (op == NULL) { | ||
return NULL; | ||
} | ||
|
||
PyUnstable_EnableTryIncRef(op); | ||
#ifdef Py_GIL_DISABLED | ||
// PyUnstable_EnableTryIncRef sets the shared flags to *at least* | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This comment seems incomplete, can you elaborate it a bit more? |
||
assert((op->ob_ref_shared & _Py_REF_SHARED_FLAG_MASK) >= _Py_REF_MAYBE_WEAKREF); | ||
#endif | ||
|
||
if (!PyUnstable_TryIncRef(op)) { | ||
PyErr_SetString(PyExc_AssertionError, "PyUnstable_TryIncRef failed"); | ||
Py_DECREF(op); | ||
return NULL; | ||
} | ||
Py_DECREF(op); // undo try-incref | ||
Py_DECREF(op); // dealloc | ||
assert(MyObject_dealloc_called == 1); | ||
vstinner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Py_RETURN_NONE; | ||
} | ||
|
||
static PyMethodDef test_methods[] = { | ||
{"call_pyobject_print", call_pyobject_print, METH_VARARGS}, | ||
{"pyobject_print_null", pyobject_print_null, METH_VARARGS}, | ||
{"pyobject_print_noref_object", pyobject_print_noref_object, METH_VARARGS}, | ||
{"pyobject_print_os_error", pyobject_print_os_error, METH_VARARGS}, | ||
{"pyobject_clear_weakrefs_no_callbacks", pyobject_clear_weakrefs_no_callbacks, METH_O}, | ||
{"pyobject_enable_deferred_refcount", pyobject_enable_deferred_refcount, METH_O}, | ||
{"test_py_try_inc_ref", test_py_try_inc_ref, METH_NOARGS}, | ||
{NULL}, | ||
}; | ||
|
||
|
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
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
Oops, something went wrong.
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.
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.
In C API docs the term
borrowed reference
is more common thanunowned reference
, can you use that?There's a glossary entry for it so it can be linked to that.
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.
I'll update the term, but I don't love the use of "borrowed reference" here. This seems different to me than the typical use of "borrowed reference" -- there's not a particular reference that's borrowed here. It's more like a building block for weak reference like objects without using
PyWeakReference
.cpython/Include/cpython/weakrefobject.h
Line 12 in d95ba9f