[3.0] Fix memory leak, scene graph layers are never deleted from memory

[platform/core/uifw/dali-core.git] / dali / internal / update / nodes / node.cpp

diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp
index 1465543..ebf6565 100644 (file)
--- a/dali/internal/update/nodes/node.cpp
+++ b/dali/internal/update/nodes/node.cpp
@@ -27,7 +27,8 @@
 
 namespace //Unnamed namespace
 {
-//Memory pool used to allocate new nodes. Memory used by this pool will be released when shutting down DALi
+//Memory pool used to allocate new nodes. Memory used by this pool will be released when process dies
+// or DALI library is unloaded
 Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::Node> gNodeMemoryPool;
 }
 
@@ -43,11 +44,30 @@ namespace SceneGraph
 const PositionInheritanceMode Node::DEFAULT_POSITION_INHERITANCE_MODE( INHERIT_PARENT_POSITION );
 const ColorMode Node::DEFAULT_COLOR_MODE( USE_OWN_MULTIPLY_PARENT_ALPHA );
 
+
 Node* Node::New()
 {
   return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node();
 }
 
+void Node::Delete( Node* node )
+{
+  // check we have a node not a layer
+  if( !node->mIsLayer )
+  {
+    // Manually call the destructor
+    node->~Node();
+
+    // Mark the memory it used as free in the memory pool
+    gNodeMemoryPool.FreeThreadSafe( node );
+  }
+  else
+  {
+    // not in the pool, just delete it.
+    delete node;
+  }
+}
+
 Node::Node()
 : mTransformManager(0),
   mTransformId( INVALID_TRANSFORM_ID ),
@@ -75,7 +95,8 @@ Node::Node()
   mDrawMode( DrawMode::NORMAL ),
   mColorMode( DEFAULT_COLOR_MODE ),
   mClippingMode( ClippingMode::DISABLED ),
-  mIsRoot( false )
+  mIsRoot( false ),
+  mIsLayer( false )
 {
   mUniformMapChanged[0] = 0u;
   mUniformMapChanged[1] = 0u;
@@ -89,11 +110,6 @@ Node::~Node()
   }
 }
 
-void Node::operator delete( void* ptr )
-{
-  gNodeMemoryPool.FreeThreadSafe( static_cast<Node*>( ptr ) );
-}
-
 void Node::OnDestroy()
 {
   // Animators, Constraints etc. should be disconnected from the child's properties.
@@ -297,6 +313,22 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex )
 
 } // namespace SceneGraph
 
+template <>
+void OwnerPointer<Dali::Internal::SceneGraph::Node>::Reset()
+{
+  if( mObject != NULL )
+  {
+    Dali::Internal::SceneGraph::Node::Delete( mObject );
+    mObject = NULL;
+  }
+}
+
 } // namespace Internal
 
+template <>
+void OwnerContainer<Dali::Internal::SceneGraph::Node*>::Delete(Dali::Internal::SceneGraph::Node* pointer)
+{
+  Dali::Internal::SceneGraph::Node::Delete( pointer );
+}
+
 } // namespace Dali