mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
* Pure `git merge --squash smart_holder` (no manual interventions). * Remove ubench/ directory. * Remove include/pybind11/smart_holder.h * [ci skip] smart_ptrs.rst updates [WIP/unfinished] * [ci skip] smart_ptrs.rst updates continued; also updating classes.rst, advanced/classes.rst * Remove README_smart_holder.rst * Restore original README.rst from master * [ci skip] Minimal change to README.rst, to leave a hint that this is pybind11v3 * [ci skip] Work in ChatGPT suggestions. * Change macro name to PYBIND11_RUN_TESTING_WITH_SMART_HOLDER_AS_DEFAULT_BUT_NEVER_USE_IN_PRODUCTION_PLEASE * Add a note pointing to the holder reinterpret_cast. * Incorporate suggestion by @virtuald: https://github.com/pybind/pybind11/pull/5542#discussion_r1967000989 * Systematically change most py::class_ to py::classh under docs/ * Remove references to README_smart_holder.rst This should have been part of commiteb550d03d3. * [ci skip] Fix minor oversight (``class_`` -> ``py::class_``) noticed by chance. * [ci skip] Resolve suggestion by @virtuald https://github.com/pybind/pybind11/pull/5542#discussion_r1969940605 * [ci skip] Apply suggestions by @timohl (thanks!) * https://github.com/pybind/pybind11/pull/5542#discussion_r1970714551 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971315329 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971322821 * Replace `classh : class_` inhertance with `using`, as suggested by @henryiii https://github.com/pybind/pybind11/pull/5542#issuecomment-2689034104 * Revert "Systematically change most py::class_ to py::classh under docs/" This reverts commitac9d31e13f. * docs: focus on py::smart_holder instead of py::classh Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * Restore minor general fixes that got lost whenac9d31e13fwas reverted. * Remove `- smart_holder` from list of branches in all .github/workflows * Extend classh note to explain whitespace noise motivation. * Suggest `py::smart_holder` for "most situations for safety" * Add back PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT This define was * introduced with https://github.com/pybind/pybind11/pull/5286 * removed with https://github.com/pybind/pybind11/pull/5531 It is has been in use here: *f02a2b7653/pybind11_protobuf/native_proto_caster.h (L89-L101)Currently pybind11 unit tests for the two holder caster backwards compatibility traits * `copyable_holder_caster_shared_ptr_with_smart_holder_support_enabled` * `move_only_holder_caster_unique_ptr_with_smart_holder_support_enabled` are missing. * Add py::trampoline_self_life_support to all trampoline examples under docs/. Address suggestion by @timohl: * https://github.com/pybind/pybind11/pull/5542#issuecomment-2686452062 Add to the "please think twice" note: the overhead for safety is likely in the noise. Also fix a two-fold inconsistency introduced by revert-commit1e646c91b4: 1. py::trampoline_self_life_support is mentioned in a note, but is missing in the example right before. 2. The section starting with To enable safely passing a ``std::unique_ptr`` to a trampoline object between is obsolete. * Fix whitespace accident (indentation) introduced with1e646c91b4Apparently the mis-indentation was introduced when resolving merge conflicts for what became1e646c91b4* WHITESPACE CHANGES ONLY in README.rst (list of people that made significant contributions) * Add Ethan Steinberg to list of people that made significant contributions (for completeness, unrelated to smart_holder work). * [ci skip] Add to list of people that made significant contributions: major and/or influential contributors to smart_holder branch * #2904 by @rhaschke was merged on Mar 16, 2021 * #3012 by @rhaschke was merged on May 28, 2021 * #3039 by @jakobandersen was merged on Jun 29, 2021 * #3048 by @Skylion007 was merged on Jun 18, 2021 * #3588 by @virtuald was merged on Jan 3, 2022 * #3633 by @wangxf123456 was merged on Jan 25, 2022 * #3635 by @virtuald was merged on Jan 26, 2022 * #3645 by @wangxf123456 was merged on Jan 25, 2022 * #3796 by @wangxf123456 was merged on Mar 10, 2022 * #3807 by @wangxf123456 was merged on Mar 18, 2022 * #3838 by @wangxf123456 was merged on Apr 15, 2022 * #3929 by @tomba was merged on May 7, 2022 * #4031 by @wangxf123456 was merged on Jun 27, 2022 * #4343 by @wangxf123456 was merged on Nov 18, 2022 * #4381 by @wangxf123456 was merged on Dec 5, 2022 * #4539 by @wangxf123456 was merged on Feb 28, 2023 * #4609 by @wangxf123456 was merged on Apr 6, 2023 * #4775 by @wangxf123456 was merged on Aug 3, 2023 * #4921 by @iwanders was merged on Nov 7, 2023 * #4924 by @iwanders was merged on Nov 6, 2023 * #5401 by @msimacek was merged on Oct 8, 2024 Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com>
155 lines
4.1 KiB
Python
155 lines
4.1 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
import env # noqa: F401
|
|
import pybind11_tests.class_sh_trampoline_shared_ptr_cpp_arg as m
|
|
|
|
|
|
@pytest.mark.skipif("env.GRAALPY", reason="Cannot reliably trigger GC")
|
|
def test_shared_ptr_cpp_arg():
|
|
import weakref
|
|
|
|
class PyChild(m.SpBase):
|
|
def is_base_used(self):
|
|
return False
|
|
|
|
tester = m.SpBaseTester()
|
|
|
|
obj = PyChild()
|
|
objref = weakref.ref(obj)
|
|
|
|
# Pass the last python reference to the C++ function
|
|
tester.set_object(obj)
|
|
del obj
|
|
pytest.gc_collect()
|
|
|
|
# python reference is still around since C++ has it now
|
|
assert objref() is not None
|
|
assert tester.is_base_used() is False
|
|
assert tester.obj.is_base_used() is False
|
|
assert tester.get_object() is objref()
|
|
|
|
|
|
@pytest.mark.skipif("env.GRAALPY", reason="Cannot reliably trigger GC")
|
|
def test_shared_ptr_cpp_prop():
|
|
class PyChild(m.SpBase):
|
|
def is_base_used(self):
|
|
return False
|
|
|
|
tester = m.SpBaseTester()
|
|
|
|
# Set the last python reference as a property of the C++ object
|
|
tester.obj = PyChild()
|
|
pytest.gc_collect()
|
|
|
|
# python reference is still around since C++ has it now
|
|
assert tester.is_base_used() is False
|
|
assert tester.has_python_instance() is True
|
|
assert tester.obj.is_base_used() is False
|
|
assert tester.obj.has_python_instance() is True
|
|
|
|
|
|
@pytest.mark.skipif("env.GRAALPY", reason="Cannot reliably trigger GC")
|
|
def test_shared_ptr_arg_identity():
|
|
import weakref
|
|
|
|
tester = m.SpBaseTester()
|
|
|
|
obj = m.SpBase()
|
|
objref = weakref.ref(obj)
|
|
|
|
tester.set_object(obj)
|
|
del obj
|
|
pytest.gc_collect()
|
|
|
|
# NOTE: the behavior below is DIFFERENT from PR #2839
|
|
# python reference is gone because it is not an Alias instance
|
|
assert objref() is None
|
|
assert tester.has_python_instance() is False
|
|
|
|
|
|
@pytest.mark.skipif("env.GRAALPY", reason="Cannot reliably trigger GC")
|
|
def test_shared_ptr_alias_nonpython():
|
|
tester = m.SpBaseTester()
|
|
|
|
# C++ creates the object, a python instance shouldn't exist
|
|
tester.set_nonpython_instance()
|
|
assert tester.is_base_used() is True
|
|
assert tester.has_instance() is True
|
|
assert tester.has_python_instance() is False
|
|
|
|
# Now a python instance exists
|
|
cobj = tester.get_object()
|
|
assert cobj.has_python_instance()
|
|
assert tester.has_instance() is True
|
|
assert tester.has_python_instance() is True
|
|
|
|
# Now it's gone
|
|
del cobj
|
|
pytest.gc_collect()
|
|
assert tester.has_instance() is True
|
|
assert tester.has_python_instance() is False
|
|
|
|
# When we pass it as an arg to a new tester the python instance should
|
|
# disappear because it wasn't created with an alias
|
|
new_tester = m.SpBaseTester()
|
|
|
|
cobj = tester.get_object()
|
|
assert cobj.has_python_instance()
|
|
|
|
new_tester.set_object(cobj)
|
|
assert tester.has_python_instance() is True
|
|
assert new_tester.has_python_instance() is True
|
|
|
|
del cobj
|
|
pytest.gc_collect()
|
|
|
|
# Gone!
|
|
assert tester.has_instance() is True
|
|
assert tester.has_python_instance() is False
|
|
assert new_tester.has_instance() is True
|
|
assert new_tester.has_python_instance() is False
|
|
|
|
|
|
@pytest.mark.skipif("env.GRAALPY", reason="Cannot reliably trigger GC")
|
|
def test_shared_ptr_goaway():
|
|
import weakref
|
|
|
|
tester = m.SpGoAwayTester()
|
|
|
|
obj = m.SpGoAway()
|
|
objref = weakref.ref(obj)
|
|
|
|
assert tester.obj is None
|
|
|
|
tester.obj = obj
|
|
del obj
|
|
pytest.gc_collect()
|
|
|
|
# python reference is no longer around
|
|
assert objref() is None
|
|
# C++ reference is still around
|
|
assert tester.obj is not None
|
|
|
|
|
|
def test_infinite():
|
|
tester = m.SpBaseTester()
|
|
while True:
|
|
tester.set_object(m.SpBase())
|
|
break # Comment out for manual leak checking (use `top` command).
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"pass_through_func", [m.pass_through_shd_ptr, m.pass_through_shd_ptr_release_gil]
|
|
)
|
|
def test_std_make_shared_factory(pass_through_func):
|
|
class PyChild(m.SpBase):
|
|
def __init__(self):
|
|
super().__init__(0)
|
|
|
|
obj = PyChild()
|
|
while True:
|
|
assert pass_through_func(obj) is obj
|
|
break # Comment out for manual leak checking (use `top` command).
|