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>
138 lines
4.6 KiB
C++
138 lines
4.6 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_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;
|
|
}
|
|
};
|
|
|
|
struct SftTrampoline : Sft, py::trampoline_self_life_support {
|
|
using Sft::Sft;
|
|
};
|
|
|
|
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();
|
|
}
|
|
|
|
std::string pass_unique_ptr_cref(const std::unique_ptr<Sft> &obj) {
|
|
return obj ? obj->history : "<NULLPTR>";
|
|
}
|
|
void pass_unique_ptr_rref(std::unique_ptr<Sft> &&) {
|
|
throw std::runtime_error("Expected to not be reached.");
|
|
}
|
|
|
|
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;
|
|
|
|
TEST_SUBMODULE(class_sh_trampoline_shared_from_this, m) {
|
|
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_cref", pass_unique_ptr_cref);
|
|
m.def("pass_unique_ptr_rref", pass_unique_ptr_rref);
|
|
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);
|
|
}
|