Changeset 2265 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

11/25/21 18:25:19 (3 years ago)

Author:

ymipsl

Message:

tracking memory leak : remove context and all related object from object factory when context is finalized.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• calendar_wrapper.hpp (modified) (1 diff)
• context.cpp (modified) (1 diff)
• context.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/calendar_wrapper.hpp

@@ -82 +82 @@
   }; // class CCalendarWrapper
 
+  typedef CCalendarWrapper CCalendarWrapperGroup;
   typedef CCalendarWrapper CCalendarWrapperDefinition;
 } // namespace xios

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -289 +289 @@
    CATCH
 
+void CContext::removeContext(const string& contextId)
+{
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::deleteContext< C##Name_ >(contextId);
+  #define DECLARE_NODE_PAR(Name_, name_) CObjectFactory::deleteContext< C##Name_ >(contextId);
+  #include "node_type.conf"
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::deleteContext< C##Name_##Group >(contextId);
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+
+/*
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::dumpObjects< C##Name_##Group >();
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::dumpObjects< C##Name_>();
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+*/
+}
+
+void CContext::removeAllContexts(void)
+{
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::deleteAllContexts< C##Name_ >();
+  #define DECLARE_NODE_PAR(Name_, name_) CObjectFactory::deleteAllContexts< C##Name_ >();
+  #include "node_type.conf"
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::deleteAllContexts< C##Name_##Group >();
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+/*
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::dumpObjects< C##Name_##Group >();
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+
+  #define DECLARE_NODE(Name_, name_)     CObjectFactory::dumpObjects< C##Name_>();
+  #define DECLARE_NODE_PAR(Name_, name_) 
+  #include "node_type.conf"
+*/
+}
    ///---------------------------------------------------------------
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.hpp

@@ -246 +246 @@
         static void ShowTree(StdOStream & out = std::clog);
         static void CleanTree(void);
+        static void removeContext(const std::string& contextId);
+        static void removeAllContexts(void) ;
         int getServiceType(void) {return serviceType_;}