Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-12-01 17:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding from_raw_pointer_take_ownership_or_shared_from_this().

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-02 16:11:21 -07:00 committed by Ralf W. Grosse-Kunstleve
parent 2a265860a7
commit 775873d0b6
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/pybind11/detail/smart_holder_type_casters.h
View File

@ -270,6 +270,30 @@ struct smart_holder_type_caster_class_hooks : smart_holder_type_caster_base_tag
return &modified_type_caster_generic_load_impl::local_load; return &modified_type_caster_generic_load_impl::local_load;
} }
using holder_type = pybindit::memory::smart_holder;
template <typename WrappedType>
static void from_raw_pointer_take_ownership_or_shared_from_this(
holder_type *uninitialized_location, WrappedType *value_ptr, ...) {
new (uninitialized_location)
holder_type(holder_type::from_raw_ptr_take_ownership(value_ptr));
}
template <typename WrappedType, typename AnyBaseOfWrappedType>
static void from_raw_pointer_take_ownership_or_shared_from_this(
holder_type *uninitialized_location,
WrappedType *value_ptr,
const std::enable_shared_from_this<AnyBaseOfWrappedType> *) {
auto shd_ptr
= std::dynamic_pointer_cast<WrappedType>(detail::try_get_shared_from_this(value_ptr));
if (shd_ptr) {
new (uninitialized_location) holder_type(holder_type::from_shared_ptr(shd_ptr));
} else {
new (uninitialized_location)
holder_type(holder_type::from_shared_ptr(std::shared_ptr<WrappedType>(value_ptr)));
}
}
template <typename WrappedType, typename AliasType> template <typename WrappedType, typename AliasType>
static void init_instance_for_type(detail::instance *inst, const void *holder_const_void_ptr) { static void init_instance_for_type(detail::instance *inst, const void *holder_const_void_ptr) {
// Need for const_cast is a consequence of the type_info::init_instance type: // Need for const_cast is a consequence of the type_info::init_instance type:
@ -281,14 +305,15 @@ struct smart_holder_type_caster_class_hooks : smart_holder_type_caster_base_tag
register_instance(inst, v_h.value_ptr(), v_h.type); register_instance(inst, v_h.value_ptr(), v_h.type);
v_h.set_instance_registered(); v_h.set_instance_registered();
} }
using holder_type = pybindit::memory::smart_holder;
if (holder_void_ptr) { if (holder_void_ptr) {
// Note: inst->owned ignored. // Note: inst->owned ignored.
auto holder_ptr = static_cast<holder_type *>(holder_void_ptr); auto holder_ptr = static_cast<holder_type *>(holder_void_ptr);
new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(*holder_ptr)); new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(*holder_ptr));
} else if (inst->owned) { } else if (inst->owned) {
new (std::addressof(v_h.holder<holder_type>())) holder_type( from_raw_pointer_take_ownership_or_shared_from_this(
holder_type::from_raw_ptr_take_ownership(v_h.value_ptr<WrappedType>())); std::addressof(v_h.holder<holder_type>()),
v_h.value_ptr<WrappedType>(),
v_h.value_ptr<WrappedType>());
} else { } else {
new (std::addressof(v_h.holder<holder_type>())) new (std::addressof(v_h.holder<holder_type>()))
holder_type(holder_type::from_raw_ptr_unowned(v_h.value_ptr<WrappedType>())); holder_type(holder_type::from_raw_ptr_unowned(v_h.value_ptr<WrappedType>()));

10
tests/test_class_sh_shared_from_this.cpp
View File

@ -45,8 +45,8 @@ PYBIND11_SMART_HOLDER_TYPE_CASTERS(SharedFromThisRef)
PYBIND11_SMART_HOLDER_TYPE_CASTERS(SharedFromThisVirt) PYBIND11_SMART_HOLDER_TYPE_CASTERS(SharedFromThisVirt)
TEST_SUBMODULE(class_sh_shared_from_this, m) { TEST_SUBMODULE(class_sh_shared_from_this, m) {
// py::classh<MyObject3>(m, "MyObject3") py::classh<MyObject3>(m, "MyObject3")
// .def(py::init<int>()); .def(py::init<int>());
m.def("make_myobject3_1", []() { return new MyObject3(8); }); m.def("make_myobject3_1", []() { return new MyObject3(8); });
m.def("make_myobject3_2", []() { return std::make_shared<MyObject3>(9); }); m.def("make_myobject3_2", []() { return std::make_shared<MyObject3>(9); });
m.def("print_myobject3_1", [](const MyObject3 *obj) { py::print(obj->toString()); }); m.def("print_myobject3_1", [](const MyObject3 *obj) { py::print(obj->toString()); });
@ -55,7 +55,7 @@ TEST_SUBMODULE(class_sh_shared_from_this, m) {
// m.def("print_myobject3_4", [](const std::shared_ptr<MyObject3> *obj) { py::print((*obj)->toString()); }); // m.def("print_myobject3_4", [](const std::shared_ptr<MyObject3> *obj) { py::print((*obj)->toString()); });
using B = SharedFromThisRef::B; using B = SharedFromThisRef::B;
// py::classh<B>(m, "B"); py::classh<B>(m, "B");
py::classh<SharedFromThisRef>(m, "SharedFromThisRef") py::classh<SharedFromThisRef>(m, "SharedFromThisRef")
.def(py::init<>()) .def(py::init<>())
.def_readonly("bad_wp", &SharedFromThisRef::value) .def_readonly("bad_wp", &SharedFromThisRef::value)
@ -69,6 +69,6 @@ TEST_SUBMODULE(class_sh_shared_from_this, m) {
.def("set_holder", [](SharedFromThisRef &, std::shared_ptr<B>) { return true; }); .def("set_holder", [](SharedFromThisRef &, std::shared_ptr<B>) { return true; });
static std::shared_ptr<SharedFromThisVirt> sft(new SharedFromThisVirt()); static std::shared_ptr<SharedFromThisVirt> sft(new SharedFromThisVirt());
// py::classh<SharedFromThisVirt>(m, "SharedFromThisVirt") py::classh<SharedFromThisVirt>(m, "SharedFromThisVirt")
// .def_static("get", []() { return sft.get(); }, py::return_value_policy::reference); .def_static("get", []() { return sft.get(); }, py::return_value_policy::reference);
} }

10
tests/test_class_sh_shared_from_this.py
View File

@ -1,12 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import pytest # import pytest
from pybind11_tests import class_sh_shared_from_this as m from pybind11_tests import class_sh_shared_from_this as m
from pybind11_tests import ConstructorStats from pybind11_tests import ConstructorStats
def test_smart_ptr(capture): def test_smart_ptr(capture):
pytest.skip("WIP")
# Object3 # Object3
for i, o in zip( for i, o in zip(
[9, 8, 9], [m.MyObject3(9), m.make_myobject3_1(), m.make_myobject3_2()] [9, 8, 9], [m.MyObject3(9), m.make_myobject3_1(), m.make_myobject3_2()]
@ -32,7 +31,6 @@ def test_smart_ptr(capture):
def test_shared_from_this_ref(): def test_shared_from_this_ref():
pytest.skip("WIP")
s = m.SharedFromThisRef() s = m.SharedFromThisRef()
stats = ConstructorStats.get(m.B) stats = ConstructorStats.get(m.B)
assert stats.alive() == 2 assert stats.alive() == 2
@ -48,7 +46,6 @@ def test_shared_from_this_ref():
def test_shared_from_this_bad_wp(): def test_shared_from_this_bad_wp():
pytest.skip("WIP")
s = m.SharedFromThisRef() s = m.SharedFromThisRef()
stats = ConstructorStats.get(m.B) stats = ConstructorStats.get(m.B)
assert stats.alive() == 2 assert stats.alive() == 2
@ -57,7 +54,7 @@ def test_shared_from_this_bad_wp():
assert stats.alive() == 2 assert stats.alive() == 2
assert s.set_ref(bad_wp) assert s.set_ref(bad_wp)
# with pytest.raises(RuntimeError) as excinfo: # with pytest.raises(RuntimeError) as excinfo:
if 1: if 1: # XXX XXX XXX
assert s.set_holder(bad_wp) assert s.set_holder(bad_wp)
# assert "Unable to cast from non-held to held instance" in str(excinfo.value) # assert "Unable to cast from non-held to held instance" in str(excinfo.value)
del bad_wp, s del bad_wp, s
@ -65,7 +62,6 @@ def test_shared_from_this_bad_wp():
def test_shared_from_this_copy(): def test_shared_from_this_copy():
pytest.skip("WIP")
s = m.SharedFromThisRef() s = m.SharedFromThisRef()
stats = ConstructorStats.get(m.B) stats = ConstructorStats.get(m.B)
assert stats.alive() == 2 assert stats.alive() == 2
@ -80,7 +76,6 @@ def test_shared_from_this_copy():
def test_shared_from_this_holder_ref(): def test_shared_from_this_holder_ref():
pytest.skip("WIP")
s = m.SharedFromThisRef() s = m.SharedFromThisRef()
stats = ConstructorStats.get(m.B) stats = ConstructorStats.get(m.B)
assert stats.alive() == 2 assert stats.alive() == 2
@ -96,7 +91,6 @@ def test_shared_from_this_holder_ref():
def test_shared_from_this_holder_copy(): def test_shared_from_this_holder_copy():
pytest.skip("WIP")
s = m.SharedFromThisRef() s = m.SharedFromThisRef()
stats = ConstructorStats.get(m.B) stats = ConstructorStats.get(m.B)
assert stats.alive() == 2 assert stats.alive() == 2