mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 13:15:12 +00:00
Adds set_name method of pybind11::capsule class (#3866)
* Adds set_name method of pybind11::capsule class This calls PyCapsule_SetName on the underlying capsule object. modified destructors to query capsules's Name [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Handle possible exception thrown by PyCapsule_GetName Also removed accidentally reintroduced use of `const char *&`. [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Fixed function name * Introduced private static function to reuse get_name_or_throw * added tests for capsule renaming * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * handle python error in flight * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Initialized PyObject * variables to nullptr * use write-unraisable if PyCapsule_GetName raises * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * get_name_or_throw->get_name_no_throw If PyCapsule_GetName raises an error we should write as unraisable to consume it and notify user, and then restore the error in flight if any. This way this method called from destructor would not modify interpreter error state. * used error_scope struct * Renamed get_name_no_throw->get_name_in_error_scope Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
ad0de0f5a6
commit
fa98804a07
@ -1588,7 +1588,8 @@ public:
|
|||||||
}
|
}
|
||||||
pybind11_fail("Unable to get capsule context");
|
pybind11_fail("Unable to get capsule context");
|
||||||
}
|
}
|
||||||
void *ptr = PyCapsule_GetPointer(o, nullptr);
|
const char *name = get_name_in_error_scope(o);
|
||||||
|
void *ptr = PyCapsule_GetPointer(o, name);
|
||||||
if (ptr == nullptr) {
|
if (ptr == nullptr) {
|
||||||
throw error_already_set();
|
throw error_already_set();
|
||||||
}
|
}
|
||||||
@ -1602,7 +1603,8 @@ public:
|
|||||||
|
|
||||||
explicit capsule(void (*destructor)()) {
|
explicit capsule(void (*destructor)()) {
|
||||||
m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {
|
m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {
|
||||||
auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, nullptr));
|
const char *name = get_name_in_error_scope(o);
|
||||||
|
auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, name));
|
||||||
if (destructor == nullptr) {
|
if (destructor == nullptr) {
|
||||||
throw error_already_set();
|
throw error_already_set();
|
||||||
}
|
}
|
||||||
@ -1637,7 +1639,33 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *name() const { return PyCapsule_GetName(m_ptr); }
|
const char *name() const {
|
||||||
|
const char *name = PyCapsule_GetName(m_ptr);
|
||||||
|
if ((name == nullptr) && PyErr_Occurred()) {
|
||||||
|
throw error_already_set();
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Replaces a capsule's name *without* calling the destructor on the existing one.
|
||||||
|
void set_name(const char *new_name) {
|
||||||
|
if (PyCapsule_SetName(m_ptr, new_name) != 0) {
|
||||||
|
throw error_already_set();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static const char *get_name_in_error_scope(PyObject *o) {
|
||||||
|
error_scope error_guard;
|
||||||
|
|
||||||
|
const char *name = PyCapsule_GetName(o);
|
||||||
|
if ((name == nullptr) && PyErr_Occurred()) {
|
||||||
|
// write out and consume error raised by call to PyCapsule_GetName
|
||||||
|
PyErr_WriteUnraisable(o);
|
||||||
|
}
|
||||||
|
|
||||||
|
return name;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class tuple : public object {
|
class tuple : public object {
|
||||||
|
@ -159,6 +159,15 @@ TEST_SUBMODULE(pytypes, m) {
|
|||||||
return py::capsule([]() { py::print("destructing capsule"); });
|
return py::capsule([]() { py::print("destructing capsule"); });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
m.def("return_renamed_capsule_with_destructor", []() {
|
||||||
|
py::print("creating capsule");
|
||||||
|
auto cap = py::capsule([]() { py::print("destructing capsule"); });
|
||||||
|
static const char *capsule_name = "test_name1";
|
||||||
|
py::print("renaming capsule");
|
||||||
|
cap.set_name(capsule_name);
|
||||||
|
return cap;
|
||||||
|
});
|
||||||
|
|
||||||
m.def("return_capsule_with_destructor_2", []() {
|
m.def("return_capsule_with_destructor_2", []() {
|
||||||
py::print("creating capsule");
|
py::print("creating capsule");
|
||||||
return py::capsule((void *) 1234, [](void *ptr) {
|
return py::capsule((void *) 1234, [](void *ptr) {
|
||||||
@ -166,6 +175,17 @@ TEST_SUBMODULE(pytypes, m) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
m.def("return_renamed_capsule_with_destructor_2", []() {
|
||||||
|
py::print("creating capsule");
|
||||||
|
auto cap = py::capsule((void *) 1234, [](void *ptr) {
|
||||||
|
py::print("destructing capsule: {}"_s.format((size_t) ptr));
|
||||||
|
});
|
||||||
|
static const char *capsule_name = "test_name2";
|
||||||
|
py::print("renaming capsule");
|
||||||
|
cap.set_name(capsule_name);
|
||||||
|
return cap;
|
||||||
|
});
|
||||||
|
|
||||||
m.def("return_capsule_with_name_and_destructor", []() {
|
m.def("return_capsule_with_name_and_destructor", []() {
|
||||||
auto capsule = py::capsule((void *) 12345, "pointer type description", [](PyObject *ptr) {
|
auto capsule = py::capsule((void *) 12345, "pointer type description", [](PyObject *ptr) {
|
||||||
if (ptr) {
|
if (ptr) {
|
||||||
|
@ -195,6 +195,19 @@ def test_capsule(capture):
|
|||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
with capture:
|
||||||
|
a = m.return_renamed_capsule_with_destructor()
|
||||||
|
del a
|
||||||
|
pytest.gc_collect()
|
||||||
|
assert (
|
||||||
|
capture.unordered
|
||||||
|
== """
|
||||||
|
creating capsule
|
||||||
|
renaming capsule
|
||||||
|
destructing capsule
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
with capture:
|
with capture:
|
||||||
a = m.return_capsule_with_destructor_2()
|
a = m.return_capsule_with_destructor_2()
|
||||||
del a
|
del a
|
||||||
@ -207,6 +220,19 @@ def test_capsule(capture):
|
|||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
with capture:
|
||||||
|
a = m.return_renamed_capsule_with_destructor_2()
|
||||||
|
del a
|
||||||
|
pytest.gc_collect()
|
||||||
|
assert (
|
||||||
|
capture.unordered
|
||||||
|
== """
|
||||||
|
creating capsule
|
||||||
|
renaming capsule
|
||||||
|
destructing capsule: 1234
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
with capture:
|
with capture:
|
||||||
a = m.return_capsule_with_name_and_destructor()
|
a = m.return_capsule_with_name_and_destructor()
|
||||||
del a
|
del a
|
||||||
|
Loading…
Reference in New Issue
Block a user