mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 07:02:11 +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).
76 lines
2.5 KiB
C++
76 lines
2.5 KiB
C++
#include "pybind11/smart_holder.h"
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <cstddef>
|
|
#include <vector>
|
|
|
|
namespace test_class_sh_property_non_owning {
|
|
|
|
struct CoreField {
|
|
explicit CoreField(int int_value = -99) : int_value{int_value} {}
|
|
int int_value;
|
|
};
|
|
|
|
struct DataField {
|
|
DataField(int i_value, int i_shared, int i_unique)
|
|
: core_fld_value{i_value}, core_fld_shared_ptr{new CoreField{i_shared}},
|
|
core_fld_raw_ptr{core_fld_shared_ptr.get()},
|
|
core_fld_unique_ptr{new CoreField{i_unique}} {}
|
|
CoreField core_fld_value;
|
|
std::shared_ptr<CoreField> core_fld_shared_ptr;
|
|
CoreField *core_fld_raw_ptr;
|
|
std::unique_ptr<CoreField> core_fld_unique_ptr;
|
|
};
|
|
|
|
struct DataFieldsHolder {
|
|
private:
|
|
std::vector<DataField> vec;
|
|
|
|
public:
|
|
explicit DataFieldsHolder(std::size_t vec_size) {
|
|
for (std::size_t i = 0; i < vec_size; i++) {
|
|
int i11 = static_cast<int>(i) * 11;
|
|
vec.emplace_back(13 + i11, 14 + i11, 15 + i11);
|
|
}
|
|
}
|
|
|
|
DataField *vec_at(std::size_t index) {
|
|
if (index >= vec.size()) {
|
|
return nullptr;
|
|
}
|
|
return &vec[index];
|
|
}
|
|
};
|
|
|
|
} // namespace test_class_sh_property_non_owning
|
|
|
|
using namespace test_class_sh_property_non_owning;
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(CoreField)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(DataField)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(DataFieldsHolder)
|
|
|
|
TEST_SUBMODULE(class_sh_property_non_owning, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
py::classh<CoreField>(m, "CoreField").def_readwrite("int_value", &CoreField::int_value);
|
|
|
|
py::classh<DataField>(m, "DataField")
|
|
.def_readonly("core_fld_value_ro", &DataField::core_fld_value)
|
|
.def_readwrite("core_fld_value_rw", &DataField::core_fld_value)
|
|
.def_readonly("core_fld_shared_ptr_ro", &DataField::core_fld_shared_ptr)
|
|
.def_readwrite("core_fld_shared_ptr_rw", &DataField::core_fld_shared_ptr)
|
|
.def_readonly("core_fld_raw_ptr_ro", &DataField::core_fld_raw_ptr)
|
|
.def_readwrite("core_fld_raw_ptr_rw", &DataField::core_fld_raw_ptr)
|
|
.def_readwrite("core_fld_unique_ptr_rw", &DataField::core_fld_unique_ptr);
|
|
|
|
py::classh<DataFieldsHolder>(m, "DataFieldsHolder")
|
|
.def(py::init<std::size_t>())
|
|
.def("vec_at", &DataFieldsHolder::vec_at, py::return_value_policy::reference_internal);
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|