pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-12 17:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partial cleanup of tests. WIP. The cleanup uncovered a major problem.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-06-22 11:01:48 -07:00
committed by Ralf W. Grosse-Kunstleve
parent bfd4c4893e
commit adfd3e1700
4 changed files with 113 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/pybind11/detail/smart_holder_poc.h
View File

@@ -52,7 +52,8 @@ Details:
#include <typeinfo>
//#include <iostream>
inline void to_cout(std::string /*msg*/) { /*std::cout << msg << std::endl;*/ }
//inline void to_cout(std::string msg) { std::cout << msg << std::endl; }
inline void to_cout(std::string) { }
// pybindit = Python Bindings Innovation Track.
// Currently not in pybind11 namespace to signal that this POC does not depend
@@ -366,7 +367,7 @@ to_cout("LOOOK smart_holder as_shared_ptr " + std::to_string(__LINE__) + " " + _
inline void guarded_delete::operator()(void *raw_ptr) const {
if (hld) {
to_cout("LOOOK guarded_delete call hld " + std::to_string(__LINE__) + " " + __FILE__);
to_cout("RECLAIM guarded_delete call hld " + std::to_string(__LINE__) + " " + __FILE__);
assert(armed_flag);
assert(hld->vptr.get() == raw_ptr);
assert(hld->vptr_is_released);

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

@@ -397,7 +397,6 @@ to_cout("LOOOK shared_ptr_dec_ref_deleter call " + std::to_string(__LINE__) + "
auto void_raw_ptr = hld.template as_raw_ptr_unowned<void>();
auto type_raw_ptr = convert_type(void_raw_ptr);
if (hld.pointee_depends_on_holder_owner) {
auto self = reinterpret_cast<PyObject *>(load_impl.loaded_v_h.inst);
auto vptr_gd_ptr = std::get_deleter<pybindit::memory::guarded_delete>(hld.vptr);
if (vptr_gd_ptr != nullptr) {
assert(!hld.vptr_is_released);
@@ -405,6 +404,7 @@ to_cout("LOOOK shared_ptr_dec_ref_deleter call " + std::to_string(__LINE__) + "
std::shared_ptr<void> non_owning(
hld.vptr.get(),
pybindit::memory::noop_deleter_acting_as_weak_ptr_owner{hld.vptr});
auto self = reinterpret_cast<PyObject *>(load_impl.loaded_v_h.inst);
// Critical transfer-of-ownership section. This must stay together.
vptr_gd_ptr->hld = &hld;
vptr_gd_ptr->callback_ptr = dec_ref_void;
@@ -413,6 +413,7 @@ to_cout("LOOOK shared_ptr_dec_ref_deleter call " + std::to_string(__LINE__) + "
hld.vptr_is_released = true;
Py_INCREF(self);
// Critical section end.
to_cout("FRESHLY released");
return to_be_returned;
}
auto vptr_ndaawp_ptr = std::get_deleter<
@@ -421,6 +422,7 @@ to_cout("LOOOK shared_ptr_dec_ref_deleter call " + std::to_string(__LINE__) + "
assert(hld.vptr_is_released);
auto released_vptr = vptr_ndaawp_ptr->passenger.lock();
if (released_vptr != nullptr) {
to_cout("retrieved released");
return std::shared_ptr<T>(released_vptr, type_raw_ptr);
}
}