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).
145 lines
4.8 KiB
C++
145 lines
4.8 KiB
C++
// Copyright (c) 2021 The Pybind Development Team.
|
|
// All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "pybind11/smart_holder.h"
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_trampoline_shared_from_this {
|
|
|
|
struct Sft : std::enable_shared_from_this<Sft> {
|
|
std::string history;
|
|
explicit Sft(const std::string &history_seed) : history{history_seed} {}
|
|
virtual ~Sft() = default;
|
|
|
|
#if defined(__clang__)
|
|
// "Group of 4" begin.
|
|
// This group is not meant to be used, but will leave a trace in the
|
|
// history in case something goes wrong.
|
|
// However, compilers other than clang have a variety of issues. It is not
|
|
// worth the trouble covering all platforms.
|
|
Sft(const Sft &other) : enable_shared_from_this(other) { history = other.history + "_CpCtor"; }
|
|
|
|
Sft(Sft &&other) noexcept { history = other.history + "_MvCtor"; }
|
|
|
|
Sft &operator=(const Sft &other) {
|
|
history = other.history + "_OpEqLv";
|
|
return *this;
|
|
}
|
|
|
|
Sft &operator=(Sft &&other) noexcept {
|
|
history = other.history + "_OpEqRv";
|
|
return *this;
|
|
}
|
|
// "Group of 4" end.
|
|
#endif
|
|
};
|
|
|
|
struct SftSharedPtrStash {
|
|
int ser_no;
|
|
std::vector<std::shared_ptr<Sft>> stash;
|
|
explicit SftSharedPtrStash(int ser_no) : ser_no{ser_no} {}
|
|
void Clear() { stash.clear(); }
|
|
void Add(const std::shared_ptr<Sft> &obj) {
|
|
if (!obj->history.empty()) {
|
|
obj->history += "_Stash" + std::to_string(ser_no) + "Add";
|
|
}
|
|
stash.push_back(obj);
|
|
}
|
|
void AddSharedFromThis(Sft *obj) {
|
|
auto sft = obj->shared_from_this();
|
|
if (!sft->history.empty()) {
|
|
sft->history += "_Stash" + std::to_string(ser_no) + "AddSharedFromThis";
|
|
}
|
|
stash.push_back(sft);
|
|
}
|
|
std::string history(unsigned i) {
|
|
if (i < stash.size()) {
|
|
return stash[i]->history;
|
|
}
|
|
return "OutOfRange";
|
|
}
|
|
long use_count(unsigned i) {
|
|
if (i < stash.size()) {
|
|
return stash[i].use_count();
|
|
}
|
|
return -1;
|
|
}
|
|
};
|
|
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
struct SftTrampoline : Sft, py::trampoline_self_life_support {
|
|
using Sft::Sft;
|
|
};
|
|
#endif
|
|
|
|
long use_count(const std::shared_ptr<Sft> &obj) { return obj.use_count(); }
|
|
|
|
long pass_shared_ptr(const std::shared_ptr<Sft> &obj) {
|
|
auto sft = obj->shared_from_this();
|
|
if (!sft->history.empty()) {
|
|
sft->history += "_PassSharedPtr";
|
|
}
|
|
return sft.use_count();
|
|
}
|
|
|
|
void pass_unique_ptr(const std::unique_ptr<Sft> &) {}
|
|
|
|
Sft *make_pure_cpp_sft_raw_ptr(const std::string &history_seed) { return new Sft{history_seed}; }
|
|
|
|
std::unique_ptr<Sft> make_pure_cpp_sft_unq_ptr(const std::string &history_seed) {
|
|
return std::unique_ptr<Sft>(new Sft{history_seed});
|
|
}
|
|
|
|
std::shared_ptr<Sft> make_pure_cpp_sft_shd_ptr(const std::string &history_seed) {
|
|
return std::make_shared<Sft>(history_seed);
|
|
}
|
|
|
|
std::shared_ptr<Sft> pass_through_shd_ptr(const std::shared_ptr<Sft> &obj) { return obj; }
|
|
|
|
} // namespace class_sh_trampoline_shared_from_this
|
|
} // namespace pybind11_tests
|
|
|
|
using namespace pybind11_tests::class_sh_trampoline_shared_from_this;
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Sft)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(SftSharedPtrStash)
|
|
|
|
TEST_SUBMODULE(class_sh_trampoline_shared_from_this, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
py::classh<Sft, SftTrampoline>(m, "Sft")
|
|
.def(py::init<const std::string &>())
|
|
.def(py::init([](const std::string &history, int) {
|
|
return std::make_shared<SftTrampoline>(history);
|
|
}))
|
|
.def_readonly("history", &Sft::history)
|
|
// This leads to multiple entries in registered_instances:
|
|
.def(py::init([](const std::shared_ptr<Sft> &existing) { return existing; }));
|
|
|
|
py::classh<SftSharedPtrStash>(m, "SftSharedPtrStash")
|
|
.def(py::init<int>())
|
|
.def("Clear", &SftSharedPtrStash::Clear)
|
|
.def("Add", &SftSharedPtrStash::Add)
|
|
.def("AddSharedFromThis", &SftSharedPtrStash::AddSharedFromThis)
|
|
.def("history", &SftSharedPtrStash::history)
|
|
.def("use_count", &SftSharedPtrStash::use_count);
|
|
|
|
m.def("use_count", use_count);
|
|
m.def("pass_shared_ptr", pass_shared_ptr);
|
|
m.def("pass_unique_ptr", pass_unique_ptr);
|
|
m.def("make_pure_cpp_sft_raw_ptr", make_pure_cpp_sft_raw_ptr);
|
|
m.def("make_pure_cpp_sft_unq_ptr", make_pure_cpp_sft_unq_ptr);
|
|
m.def("make_pure_cpp_sft_shd_ptr", make_pure_cpp_sft_shd_ptr);
|
|
m.def("pass_through_shd_ptr", pass_through_shd_ptr);
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|