fix for CPyNodeWrapper making a reference cycle

kaaengine · Feb 2, 2020 · ebdc2e9 · ebdc2e9
1 parent 58a6c70
commit ebdc2e9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/kaa/kaacore/nodes.pxd b/kaa/kaacore/nodes.pxd
@@ -40,7 +40,7 @@ cdef extern from "kaacore/nodes.h" nogil:
         text "kaacore::NodeType::text",
 
     cdef cppclass CForeignNodeWrapper "kaacore::ForeignNodeWrapper":
-        pass
+        void on_add_to_parent()
 
     cdef cppclass CNode "kaacore::Node":
         # UNION!

diff --git a/kaa/nodes.pxi b/kaa/nodes.pxi
@@ -1,6 +1,7 @@
 from cpython.ref cimport PyObject, Py_XINCREF, Py_XDECREF
 
 from libc.stdint cimport uint32_t
+from libcpp cimport bool
 from libcpp.memory cimport unique_ptr
 
 from cymove cimport cymove as cmove
@@ -18,15 +19,23 @@ from .kaacore.geometry cimport CAlignment
 
 cdef cppclass CPyNodeWrapper(CForeignNodeWrapper):
     PyObject* py_wrapper
+    bool added_to_parent
 
     __init__(PyObject* py_wrapper):
-        Py_XINCREF(py_wrapper)
         this.py_wrapper = py_wrapper
+        this.added_to_parent = False
 
     __dealloc__():
-        Py_XDECREF(this.py_wrapper)
+        if this.added_to_parent:
+            Py_XDECREF(this.py_wrapper)
         this.py_wrapper = NULL
 
+    void on_add_to_parent() nogil:
+        with gil:
+            Py_XINCREF(py_wrapper)
+            this.added_to_parent = True
+
+
 
 cdef class NodeBase:
     cdef:

diff --git a/kaacore b/kaacore