Fix factory map leak (ros#131)

Signed-off-by: y-okumura <[email protected]>
y-okumura-isp · Jan 20, 2021 · de5c77a · de5c77a
1 parent a62623e
commit de5c77a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/include/class_loader/meta_object.hpp b/include/class_loader/meta_object.hpp
@@ -69,7 +69,7 @@ class CLASS_LOADER_PUBLIC AbstractMetaObjectBase
    * TEMPLATE SUBCLASSES, OTHERWISE THEY WILL PULL IN A REDUNDANT METAOBJECT
    * DESTRUCTOR OUTSIDE OF libclass_loader WITHIN THE PLUGIN LIBRARY! T
    */
-  ~AbstractMetaObjectBase();
+  virtual ~AbstractMetaObjectBase();
 
   /**
    * @brief Gets the literal name of the class.

diff --git a/src/class_loader_core.cpp b/src/class_loader_core.cpp
@@ -57,8 +57,26 @@ std::recursive_mutex & getPluginBaseToFactoryMapMapMutex()
 
 BaseToFactoryMapMap & getGlobalPluginBaseToFactoryMapMap()
 {
-  static BaseToFactoryMapMap instance;
-  return instance;
+
+  static std::shared_ptr<BaseToFactoryMapMap> instance;
+
+  // TODO: need lock?
+  // TODO: we may use unique_ptr but use shared_ptr for PoC
+  if(instance == nullptr) {
+    instance = std::shared_ptr<BaseToFactoryMapMap>(
+        new BaseToFactoryMapMap,
+        [](BaseToFactoryMapMap *p) mutable
+        {
+          for(auto it_map: *p) {
+            for(auto it: it_map.second) {
+              if(it.second) {
+                delete(it.second);
+              }
+            }
+          }
+        });
+  }
+  return *instance;
 }
 
 FactoryMap & getFactoryMapForBaseClass(const std::string & typeid_base_class_name)