private-attribute-cpp 2.1.0__tar.gz → 2.1.2__tar.gz

{private_attribute_cpp-2.1.0/private_attribute_cpp.egg-info → private_attribute_cpp-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.0
+Version: 2.1.2
 Summary: A Python package that provides a way to define private attributes in C++ implementation.
 Home-page: https://github.com/Locked-chess-official/private_attribute_cpp
 Author: HuangHaoHua

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.2}/private_attribute.cpp

@@ -125,6 +125,10 @@ public:
     PyObjectStorage(PyObject* obj) noexcept : obj(obj) {
         Py_XINCREF(obj);
     }
+    // support for PyCodeObject*
+    PyObjectStorage(PyCodeObject* obj) noexcept : obj(reinterpret_cast<PyObject*>(obj)) {
+        Py_XINCREF(obj);
+    }
     PyObjectStorage(const PyObjectStorage& other) noexcept : obj(other.obj) {
         Py_XINCREF(obj);
     }
@@ -155,13 +159,26 @@ public:
         obj = new_obj;
         return *this;
     }
-    ~PyObjectStorage() noexcept {
+    PyObjectStorage& operator=(PyCodeObject* new_obj) noexcept {
+        Py_XINCREF(reinterpret_cast<PyObject*>(new_obj));
         Py_XDECREF(obj);
+        obj = reinterpret_cast<PyObject*>(new_obj);
+        return *this;
+    }
+    ~PyObjectStorage() noexcept {
+        // if python has exit we don't do anything
+        if (Py_IsInitialized()) {
+            Py_XDECREF(obj);
+        }
     }
 
     operator PyObject*() const noexcept {
         return obj;
     }
+
+    operator PyCodeObject*() const noexcept {
+        return reinterpret_cast<PyCodeObject*>(obj);
+    }
     PyObject* get() const noexcept {
         return obj;
     }
@@ -176,12 +193,8 @@ namespace {
         namespace {
             static std::unordered_map<uintptr_t, std::unordered_map<std::string, PyObjectStorage>> type_attr_dict;
         };
-        static std::unordered_map<uintptr_t, std::unordered_map<uintptr_t, PyCodeObject*>> type_allowed_code_map;
+        static std::unordered_map<uintptr_t, std::unordered_map<uintptr_t, PyObjectStorage>> type_allowed_code_map;
         static std::unordered_map<uintptr_t, std::shared_ptr<std::shared_mutex>> all_type_mutex;
-        // private_func per type, stored with RAII ownership (PyObjectStorage
-        // INCREFs on assignment and DECREFs on destruction), so the map entry
-        // always owns exactly one reference - no dangling-pointer risk when the
-        // last external reference to the function disappears.
         static std::unordered_map<uintptr_t, PyObjectStorage> type_need_call;
         static std::unordered_map<uintptr_t, std::unordered_set<TwoStringTuple>> all_type_attr_set;
         namespace {
@@ -210,9 +223,34 @@ namespace {
         static std::unordered_map<uintptr_t, destructor> all_type_finalize;
 
         static std::shared_mutex all_register_new_metaclass_mutex;
-        static std::unordered_map<uintptr_t, PyObject*> all_register_type_weak_ref;
+        static std::unordered_map<uintptr_t, PyObjectStorage> all_register_type_weak_ref;
     };
 };
+
+static void
+clean_all_storages() noexcept
+{
+    AllData::cache.clear();
+    AllData::all_exist_name.clear();
+    AllData::obj_attr_keys.clear();
+    AllData::type_attr_dict.clear();
+    AllData::type_allowed_code_map.clear();
+    AllData::all_type_mutex.clear();
+    AllData::type_need_call.clear();
+    AllData::all_type_attr_set.clear();
+    AllData::all_object_attr.clear();
+    AllData::all_type_subclass_attr.clear();
+    AllData::all_object_mutex.clear();
+    AllData::all_type_subclass_mutex.clear();
+    AllData::all_type_parent_id.clear();
+    AllData::all_type_getattro.clear();
+    AllData::all_type_setattro.clear();
+    AllData::all_type_traverse.clear();
+    AllData::all_type_clear.clear();
+    AllData::all_type_finalize.clear();
+    AllData::all_register_type_weak_ref.clear();
+}
+
 struct FinalObject
 {
     PyObjectStorage result;
@@ -1623,6 +1661,21 @@ PrivateAttr_tp_clear(PyObject* self) noexcept
     return 0;
 }
 
+// get_type_need_tp_* : the metaclass counterparts of get_need_tp_*.
+// get_need_tp_*          -> find the original slots of *types created by* the
+//                            metaclasses (wrapped with the instance-level
+//                            PrivateAttr_tp_* / PrivateAttr_tp_getattro set).
+// get_type_need_tp_*     -> find the original slots of the *metaclasses*
+//                            themselves (wrapped with the metaclass-level
+//                            PrivateAttrType_getattr / PrivateAttrType_setattr /
+//                            register_finalize / PrivateAttrType_tp_traverse /
+//                            PrivateAttrType_tp_clear).
+static getattrofunc get_type_need_tp_getattro(PyTypeObject* cls) noexcept;
+static setattrofunc get_type_need_tp_setattro(PyTypeObject* cls) noexcept;
+static traverseproc get_type_need_tp_traverse(PyTypeObject* cls) noexcept;
+static inquiry get_type_need_tp_clear(PyTypeObject* cls) noexcept;
+static destructor get_type_need_tp_finalize(PyTypeObject* cls) noexcept;
+
 // metaclass-level (type object) traverse/clear: call original if any, and handle AllData-stored type attributes
 static int
 PrivateAttrType_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept
@@ -1644,7 +1697,7 @@ PrivateAttrType_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept
             if (res) return res;
         }
     } else {
-        traverseproc orig = get_need_tp_traverse(typ);
+        traverseproc orig = get_type_need_tp_traverse(typ);
         if (orig) {
             int res = orig(self, visit, arg);
             if (res) return res;
@@ -1731,7 +1784,7 @@ PrivateAttrType_tp_clear(PyObject* self) noexcept
         inquiry orig = ::AllData::all_type_clear[typ_id];
         if (orig) orig(self);
     } else {
-        inquiry orig = get_need_tp_clear(typ);
+        inquiry orig = get_type_need_tp_clear(typ);
         if (orig) orig(self);
     }
 
@@ -1815,8 +1868,8 @@ static PyTypeObject PrivateAttrType = {
     0,                                          // tp_as_buffer
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,   // tp_flags
     "metaclass for private attributes",         // tp_doc
-    0,                                          // tp_travers
-    0,                                          // tp_clear
+    (traverseproc)PrivateAttrType_tp_traverse,  // tp_travers
+    (inquiry)PrivateAttrType_tp_clear,          // tp_clear
     0,                                          // tp_richcompare
     0,                                          // tp_weaklistoffset
     0,                                          // tp_iter
@@ -2048,7 +2101,7 @@ try_get_attr_string(PyObject* obj, const char* name) noexcept
 }
 
 static void
-analyse_all_code(PyObject* obj, std::unordered_map<uintptr_t, PyCodeObject*>& map, std::unordered_set<uintptr_t>& _seen) noexcept
+analyse_all_code(PyObject* obj, std::unordered_map<uintptr_t, PyObjectStorage>& map, std::unordered_set<uintptr_t>& _seen) noexcept
 {
     uintptr_t obj_id = (uintptr_t)obj;
     if (_seen.find(obj_id) != _seen.end()) {
@@ -2056,8 +2109,7 @@ analyse_all_code(PyObject* obj, std::unordered_map<uintptr_t, PyCodeObject*>& ma
     }
     _seen.insert(obj_id);
     if (PyObject_TypeCheck(obj, &PyCode_Type)) {
-        Py_INCREF(obj);
-        map[(uintptr_t)obj] = (PyCodeObject*)obj;
+        map[(uintptr_t)obj] = obj;
         PyObject* co_contain = try_get_attr_string(obj, "co_consts");
         if (co_contain && PySequence_Check(co_contain)) {
             Py_ssize_t len = PySequence_Length(co_contain);
@@ -2218,11 +2270,11 @@ need_analyse_type(PyObject* type) noexcept
     }
     std::shared_lock lock(::AllData::all_register_new_metaclass_mutex);
     for (auto& [id, metaclassref]: ::AllData::all_register_type_weak_ref){
-        if (!PyWeakref_CheckRef(metaclassref)) {
+        if (!PyWeakref_CheckRef((PyObject*)metaclassref)) {
             continue;
         }
 #if PY_VERSION_HEX < 0x030D0000
-        PyObject* metaclass = PyWeakref_GET_OBJECT(metaclassref);
+        PyObject* metaclass = PyWeakref_GET_OBJECT((PyObject*)metaclassref);
         if (type == metaclass) continue;
         if (PyObject_IsInstance(type, metaclass)) {
             return true;
@@ -2505,21 +2557,6 @@ static traverseproc get_need_tp_traverse(PyTypeObject* cls) noexcept;
 static inquiry get_need_tp_clear(PyTypeObject* cls) noexcept;
 static destructor get_need_tp_finalize(PyTypeObject* cls) noexcept;
 
-// get_type_need_tp_* : the metaclass counterparts of get_need_tp_*.
-// get_need_tp_*          -> find the original slots of *types created by* the
-//                            metaclasses (wrapped with the instance-level
-//                            PrivateAttr_tp_* / PrivateAttr_tp_getattro set).
-// get_type_need_tp_*     -> find the original slots of the *metaclasses*
-//                            themselves (wrapped with the metaclass-level
-//                            PrivateAttrType_getattr / PrivateAttrType_setattr /
-//                            register_finalize / PrivateAttrType_tp_traverse /
-//                            PrivateAttrType_tp_clear).
-static getattrofunc get_type_need_tp_getattro(PyTypeObject* cls) noexcept;
-static setattrofunc get_type_need_tp_setattro(PyTypeObject* cls) noexcept;
-static traverseproc get_type_need_tp_traverse(PyTypeObject* cls) noexcept;
-static inquiry get_type_need_tp_clear(PyTypeObject* cls) noexcept;
-static destructor get_type_need_tp_finalize(PyTypeObject* cls) noexcept;
-
 // instance-level traverse/clear for types that use private attributes
 static int PrivateAttr_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept;
 static int PrivateAttr_tp_clear(PyObject* self) noexcept;
@@ -2739,10 +2776,7 @@ PrivateAttrType_postprocess(PyObject* new_type, PrivateAttrCreationData& data) n
     }
 
     if (data.private_func) {
-        // PyObjectStorage::operator=(PyObject*) takes its own reference here;
-        // data's reference is released by PrivateAttrCreationData::clear()
-        // right after this, and the map entry's reference is released when the
-        // entry is erased in PrivateAttrType_finalize.
+        Py_INCREF(data.private_func);
         ::AllData::type_need_call[type_id] = data.private_func;
     }
 
@@ -3225,13 +3259,9 @@ PrivateAttrType_finalize(PyObject* cls) noexcept
         ::AllData::all_type_attr_set.erase(typ_id);
     }
     if (::AllData::type_allowed_code_map.find(typ_id) != ::AllData::type_allowed_code_map.end()) {
-        for (auto& [id, obj] : ::AllData::type_allowed_code_map[typ_id]) {
-            Py_XDECREF(obj);
-        }
         ::AllData::type_allowed_code_map.erase(typ_id);
     }
     if (::AllData::type_need_call.find(typ_id) != ::AllData::type_need_call.end()) {
-        // erase() destroys the PyObjectStorage, which DECREFs private_func.
         ::AllData::type_need_call.erase(typ_id);
     }
     if (::AllData::type_attr_dict.find(typ_id) != ::AllData::type_attr_dict.end()) {
@@ -3541,7 +3571,7 @@ is_class_of_registed_type(PyObject* metaclass) noexcept
             continue;
         }
 #if PY_VERSION_HEX < 0x030D0000
-        PyObject* instance = PyWeakref_GET_OBJECT(instanceref);
+        PyObject* instance = PyWeakref_GET_OBJECT((PyObject*)instanceref);
         if (instance == metaclass) continue;
         if (PyObject_IsInstance(instance, metaclass)) {
             return true;
@@ -4033,10 +4063,66 @@ static PyModuleDef def = {
     NULL
 };
 
+static PyObject*
+AtExit_clean_storage(PyObject* /*self*/, PyObject* /*obj*/) noexcept
+{
+    clean_all_storages();
+    Py_RETURN_NONE;
+}
+
+static PyMethodDef clean_storage = {
+    "clean_storage",
+    (PyCFunction)AtExit_clean_storage,
+    METH_NOARGS,
+    "Clean all storages"
+};
+
+static int
+atexit_register_clean_func(void) noexcept
+{
+    PyObject* atexit = PyImport_ImportModule("atexit");
+    if (!atexit) {
+        return -1;
+    }
+    PyObject* register_func = PyObject_GetAttrString(atexit, "register");
+    if (!register_func) {
+        Py_DECREF(atexit);
+        return -1;
+    }
+
+    PyObject* func = PyCFunction_New(&clean_storage, NULL);
+    if (!func) {
+        Py_DECREF(register_func);
+        Py_DECREF(atexit);
+        return -1;
+    }
+    PyObject* args = PyTuple_New(1);
+    if (!args) {
+        Py_DECREF(func);
+        Py_DECREF(register_func);
+        Py_DECREF(atexit);
+        return -1;
+    }
+    PyTuple_SET_ITEM(args, 0, func);
+    PyObject* result = PyObject_CallObject(register_func, args);
+    if (result == NULL) {
+        Py_DECREF(args);
+        Py_DECREF(register_func);
+        Py_DECREF(atexit);
+        return -1;
+    }
+    Py_DECREF(args);
+    Py_DECREF(register_func);
+    Py_DECREF(atexit);
+    Py_DECREF(result);
+    return 0;
+}
+
 PyMODINIT_FUNC
 PyInit_private_attribute(void) noexcept
 {
     if (init_all_slots() <0 ||
+        atexit_register_clean_func() < 0 ||
         PyType_Ready(&PrivateWrapType) < 0 ||
         PyType_Ready(&PrivateWrapProxyType) < 0 ||
         PyType_Ready(&PrivateAttrType) < 0 ||

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.2/private_attribute_cpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.0
+Version: 2.1.2
 Summary: A Python package that provides a way to define private attributes in C++ implementation.
 Home-page: https://github.com/Locked-chess-official/private_attribute_cpp
 Author: HuangHaoHua

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.2}/setup.py

@@ -18,7 +18,7 @@ readme = open('README.md').read()
 
 setup(
     name='private_attribute_cpp',
-    version='2.1.0',
+    version='2.1.2',
     author="HuangHaoHua",
     author_email="13140752715@example.com",
     description='A Python package that provides a way to define private attributes in C++ implementation.',