mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-25 22:52:01 +00:00
48f25275c4
* Put bakein branch @ 18b72c0ffa on top of smart_holder branch:
Commands used:
```
git checkout bakein
git diff smart_holder > ~/zd
git checkout smart_holder
git checkout -b bakein_sh
patch -p 1 < ~/zd
git checkout smart_holder \
MANIFEST.in \
README.rst \
README_smart_holder.rst \
docs/advanced/smart_ptrs.rst \
ubench/holder_comparison.cpp \
ubench/holder_comparison.py \
ubench/holder_comparison_extract_sheet_data.py \
ubench/number_bucket.h \
ubench/python/number_bucket.clif
git add -A
```
* Add back README_smart_holder.rst in tests/extra_python_package/test_files.py
* Restore smart_holder_poc.h as-is on smart_holder branch (i.e. undo `PYBIND11_SMART_HOLDER_PADDING`, which was meant for stress-testing only).
* Insert `std::move()` as suggested by @laramiel
* `property_cpp_function_sh_*` named specializations, as suggested by @laramiel (https://github.com/pybind/pybind11/pull/5257#discussion_r1688346807)
* Call `property_cpp_function_classic` member functions, rather than inlining the implementations.
* Use `PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT` in holder_comparison.cpp (holder_comparison.py is NOT changed accordingly in this commit, i.e. can still only be run if the smart_holder functionality is available).
* Systematically rename `loaded_as` to `load_as` (`shared_ptr`, `unique_ptr`) as suggested by @laramiel
* Make change as suggested by @laramiel. This makes it much more obvious that the latest implementation of `smart_holder_from_unique_ptr()` accepts all existing `return_value_policy` enum values except `copy`.
* Resolve `BAKEIN_WIP: Rewrite comment.` for `property_cpp_function_*` specializations.
* Resolve `BAKEIN_WIP: Add comment to explain: This is meant for stress-testing only.`
* Resolve all remaining BAKEIN_WIP (in pybind11/cast.h).
Leave only two pairs of SMART_HOLDER_BAKEIN_FOLLOW_ON comments: refactoring of copyable_holder_caster, move_only_holder_caster. This is best left until after the smart_holder branch is merged into the master branch.
* Remove obsolete `using holder_type = smart_holder;` in `load_helper`
* Add SMART_HOLDER_BAKEIN_FOLLOW_ON comment for `internals::default_holder`
* README_smart_holder.rst update (line count reduced from 356 to 123).
84 lines
2.9 KiB
Python
84 lines
2.9 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import class_sh_disowning as m
|
|
|
|
if not m.defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT:
|
|
pytest.skip("smart_holder not available.", allow_module_level=True)
|
|
|
|
|
|
def is_disowned(obj):
|
|
try:
|
|
obj.get()
|
|
except ValueError:
|
|
return True
|
|
return False
|
|
|
|
|
|
def test_same_twice():
|
|
while True:
|
|
obj1a = m.Atype1(57)
|
|
obj1b = m.Atype1(62)
|
|
assert m.same_twice(obj1a, obj1b) == (57 * 10 + 1) * 100 + (62 * 10 + 1) * 10
|
|
assert is_disowned(obj1a)
|
|
assert is_disowned(obj1b)
|
|
obj1c = m.Atype1(0)
|
|
with pytest.raises(ValueError):
|
|
# Disowning works for one argument, but not both.
|
|
m.same_twice(obj1c, obj1c)
|
|
assert is_disowned(obj1c)
|
|
return # Comment out for manual leak checking (use `top` command).
|
|
|
|
|
|
def test_mixed():
|
|
first_pass = True
|
|
while True:
|
|
obj1a = m.Atype1(90)
|
|
obj2a = m.Atype2(25)
|
|
assert m.mixed(obj1a, obj2a) == (90 * 10 + 1) * 200 + (25 * 10 + 2) * 20
|
|
assert is_disowned(obj1a)
|
|
assert is_disowned(obj2a)
|
|
|
|
# The C++ order of evaluation of function arguments is (unfortunately) unspecified:
|
|
# https://en.cppreference.com/w/cpp/language/eval_order
|
|
# Read on.
|
|
obj1b = m.Atype1(0)
|
|
with pytest.raises(ValueError):
|
|
# If the 1st argument is evaluated first, obj1b is disowned before the conversion for
|
|
# the already disowned obj2a fails as expected.
|
|
m.mixed(obj1b, obj2a)
|
|
obj2b = m.Atype2(0)
|
|
with pytest.raises(ValueError):
|
|
# If the 2nd argument is evaluated first, obj2b is disowned before the conversion for
|
|
# the already disowned obj1a fails as expected.
|
|
m.mixed(obj1a, obj2b)
|
|
|
|
# Either obj1b or obj2b was disowned in the expected failed m.mixed() calls above, but not
|
|
# both.
|
|
is_disowned_results = (is_disowned(obj1b), is_disowned(obj2b))
|
|
assert is_disowned_results.count(True) == 1
|
|
if first_pass:
|
|
first_pass = False
|
|
print(
|
|
"\nC++ function argument %d is evaluated first."
|
|
% (is_disowned_results.index(True) + 1)
|
|
)
|
|
|
|
return # Comment out for manual leak checking (use `top` command).
|
|
|
|
|
|
def test_overloaded():
|
|
while True:
|
|
obj1 = m.Atype1(81)
|
|
obj2 = m.Atype2(60)
|
|
with pytest.raises(TypeError):
|
|
m.overloaded(obj1, "NotInt")
|
|
assert obj1.get() == 81 * 10 + 1 # Not disowned.
|
|
assert m.overloaded(obj1, 3) == (81 * 10 + 1) * 30 + 3
|
|
with pytest.raises(TypeError):
|
|
m.overloaded(obj2, "NotInt")
|
|
assert obj2.get() == 60 * 10 + 2 # Not disowned.
|
|
assert m.overloaded(obj2, 2) == (60 * 10 + 2) * 40 + 2
|
|
return # Comment out for manual leak checking (use `top` command).
|