-
Notifications
You must be signed in to change notification settings - Fork 2.2k
[Smart holder] Support void pointer capsules #3633
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ccb1afb
Make smart holder type casters support void pointer capsules.
wangxf123456 3e3f70c
Fix warnings
wangxf123456 c42912d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2fffb6f
Fix checks
wangxf123456 e5a5607
Merge branch 'smart_holder' of github.com:wangxf123456/pybind11 into …
wangxf123456 e3b0e23
Fix check failures under CentOS
wangxf123456 505bfba
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 76dc820
Remove unused regex module
wangxf123456 86b6cea
Merge branch 'smart_holder' of github.com:wangxf123456/pybind11 into …
wangxf123456 c0b669f
Resolve comments
wangxf123456 6c48f56
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] dc45d1b
Resolve comments
wangxf123456 82b6363
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 9595439
Fix clangtidy
wangxf123456 f571da2
Resolve comments
wangxf123456 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,146 @@ | ||
#include "pybind11_tests.h" | ||
|
||
#include <pybind11/smart_holder.h> | ||
|
||
#include <memory> | ||
|
||
namespace pybind11_tests { | ||
namespace class_sh_void_ptr_capsule { | ||
|
||
// Without the helper we will run into a type_caster::load recursion. | ||
// This is because whenever the type_caster::load is called, it checks | ||
// whether the object defines an `as_` method that returns the void pointer | ||
// capsule. If yes, it calls the method. But in the following testcases, those | ||
// `as_` methods are defined with pybind11, which implicitly takes the object | ||
// itself as the first parameter. Therefore calling those methods causes loading | ||
// the object again, which causes infinite recursion. | ||
// This test is unusual in the sense that the void pointer capsules are meant to | ||
// be provided by objects wrapped with systems other than pybind11 | ||
// (i.e. having to avoid the recursion is an artificial problem, not the norm). | ||
// Conveniently, the helper also serves to keep track of `capsule_generated`. | ||
struct HelperBase { | ||
HelperBase() = default; | ||
virtual ~HelperBase() = default; | ||
|
||
bool capsule_generated = false; | ||
virtual int get() const { return 100; } | ||
}; | ||
|
||
struct Valid: public HelperBase { | ||
int get() const override { return 101; } | ||
|
||
PyObject* as_pybind11_tests_class_sh_void_ptr_capsule_Valid() { | ||
void* vptr = dynamic_cast<void*>(this); | ||
capsule_generated = true; | ||
// We assume vptr out lives the capsule, so we use nullptr for the | ||
// destructor. | ||
return PyCapsule_New( | ||
vptr, "::pybind11_tests::class_sh_void_ptr_capsule::Valid", | ||
nullptr); | ||
} | ||
}; | ||
|
||
struct NoConversion: public HelperBase { | ||
int get() const override { return 102; } | ||
}; | ||
|
||
struct NoCapsuleReturned: public HelperBase { | ||
int get() const { return 103; } | ||
|
||
PyObject* as_pybind11_tests_class_sh_void_ptr_capsule_NoCapsuleReturned() { | ||
capsule_generated = true; | ||
Py_XINCREF(Py_None); | ||
return Py_None; | ||
} | ||
}; | ||
|
||
struct AsAnotherObject: public HelperBase { | ||
int get() const override { return 104; } | ||
|
||
PyObject* as_pybind11_tests_class_sh_void_ptr_capsule_Valid() { | ||
void* vptr = dynamic_cast<void*>(this); | ||
capsule_generated = true; | ||
// We assume vptr out lives the capsule, so we use nullptr for the | ||
// destructor. | ||
return PyCapsule_New( | ||
vptr, "::pybind11_tests::class_sh_void_ptr_capsule::Valid", | ||
nullptr); | ||
} | ||
}; | ||
|
||
int get_from_valid_capsule(const Valid* c) { | ||
return c->get(); | ||
} | ||
|
||
int get_from_shared_ptr_valid_capsule(std::shared_ptr<Valid> c) { | ||
return c->get(); | ||
} | ||
|
||
int get_from_unique_ptr_valid_capsule(std::unique_ptr<Valid> c) { | ||
return c->get(); | ||
} | ||
|
||
int get_from_no_conversion_capsule(const NoConversion* c) { | ||
return c->get(); | ||
} | ||
|
||
int get_from_no_capsule_returned(const NoCapsuleReturned* c) { | ||
return c->get(); | ||
} | ||
|
||
} // namespace class_sh_void_ptr_capsule | ||
} // namespace pybind11_tests | ||
|
||
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::HelperBase) | ||
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::Valid) | ||
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::NoConversion) | ||
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::NoCapsuleReturned) | ||
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_void_ptr_capsule::AsAnotherObject) | ||
|
||
TEST_SUBMODULE(class_sh_void_ptr_capsule, m) { | ||
using namespace pybind11_tests::class_sh_void_ptr_capsule; | ||
|
||
py::classh<HelperBase>(m, "HelperBase") | ||
.def(py::init<>()) | ||
.def("get", &HelperBase::get) | ||
.def_readonly("capsule_generated", &HelperBase::capsule_generated); | ||
|
||
py::classh<Valid, HelperBase>(m, "Valid") | ||
.def(py::init<>()) | ||
.def("as_pybind11_tests_class_sh_void_ptr_capsule_Valid", | ||
[](HelperBase* self) { | ||
Valid *obj = dynamic_cast<Valid *>(self); | ||
assert(obj != nullptr); | ||
PyObject* capsule = obj->as_pybind11_tests_class_sh_void_ptr_capsule_Valid(); | ||
return pybind11::reinterpret_steal<py::capsule>(capsule); | ||
}); | ||
|
||
py::classh<NoConversion, HelperBase>(m, "NoConversion") | ||
.def(py::init<>()); | ||
|
||
py::classh<NoCapsuleReturned, HelperBase>(m, "NoCapsuleReturned") | ||
.def(py::init<>()) | ||
.def("as_pybind11_tests_class_sh_void_ptr_capsule_NoCapsuleReturned", | ||
[](HelperBase* self) { | ||
NoCapsuleReturned *obj = dynamic_cast<NoCapsuleReturned *>(self); | ||
assert(obj != nullptr); | ||
PyObject* capsule = obj->as_pybind11_tests_class_sh_void_ptr_capsule_NoCapsuleReturned(); | ||
return pybind11::reinterpret_steal<py::capsule>(capsule); | ||
}); | ||
|
||
py::classh<AsAnotherObject, HelperBase>(m, "AsAnotherObject") | ||
.def(py::init<>()) | ||
.def("as_pybind11_tests_class_sh_void_ptr_capsule_Valid", | ||
[](HelperBase* self) { | ||
AsAnotherObject *obj = dynamic_cast<AsAnotherObject *>(self); | ||
assert(obj != nullptr); | ||
PyObject* capsule = obj->as_pybind11_tests_class_sh_void_ptr_capsule_Valid(); | ||
return pybind11::reinterpret_steal<py::capsule>(capsule); | ||
}); | ||
|
||
m.def("get_from_valid_capsule", &get_from_valid_capsule); | ||
m.def("get_from_shared_ptr_valid_capsule", &get_from_shared_ptr_valid_capsule); | ||
m.def("get_from_unique_ptr_valid_capsule", &get_from_unique_ptr_valid_capsule); | ||
m.def("get_from_no_conversion_capsule", &get_from_no_conversion_capsule); | ||
m.def("get_from_no_capsule_returned", &get_from_no_capsule_returned); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# -*- coding: utf-8 -*- | ||
import pytest | ||
|
||
from pybind11_tests import class_sh_void_ptr_capsule as m | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"ctor, caller, expected, capsule_generated", | ||
[ | ||
(m.Valid, m.get_from_valid_capsule, 101, True), | ||
(m.NoConversion, m.get_from_no_conversion_capsule, 102, False), | ||
(m.NoCapsuleReturned, m.get_from_no_capsule_returned, 103, True), | ||
(m.AsAnotherObject, m.get_from_valid_capsule, 104, True), | ||
], | ||
) | ||
def test_as_void_ptr_capsule(ctor, caller, expected, capsule_generated): | ||
obj = ctor() | ||
assert caller(obj) == expected | ||
assert obj.capsule_generated == capsule_generated | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"ctor, caller, pointer_type, capsule_generated", | ||
[ | ||
(m.AsAnotherObject, m.get_from_shared_ptr_valid_capsule, "shared_ptr", True), | ||
(m.AsAnotherObject, m.get_from_unique_ptr_valid_capsule, "unique_ptr", True), | ||
], | ||
) | ||
def test_as_void_ptr_capsule_unsupported(ctor, caller, pointer_type, capsule_generated): | ||
obj = ctor() | ||
with pytest.raises(RuntimeError) as excinfo: | ||
caller(obj) | ||
assert pointer_type in str(excinfo.value) | ||
assert obj.capsule_generated == capsule_generated |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.