Remove memory leaks

Signed-off-by: ahcorde <ahcorde@gmail.com>

Author: ahcorde

include/class_loader/class_loader.hpp

@@ -169,6 +169,7 @@ class ClassLoader
   template<class Base>
   Base * createUnmanagedInstance(const std::string & derived_class_name)
   {
+    class_loader_ref_count--;
     return createRawInstance<Base>(derived_class_name, false);
   }
 
@@ -252,6 +253,15 @@ class ClassLoader
   CLASS_LOADER_PUBLIC
   int unloadLibrary();
 
+  void removeWhenPosible()
+  {
+    this->remove_when_possible = true;
+    if (class_loader_ref_count == 0) {
+      unloadLibraryInternal(false);
+      delete this;
+    }
+  }
+
 private:
   /**
    * @brief Callback method when a plugin created by this class loader is destroyed
@@ -271,9 +281,15 @@ class ClassLoader
     delete (obj);
     assert(plugin_ref_count_ > 0);
     --plugin_ref_count_;
-    if (plugin_ref_count_ == 0 && isOnDemandLoadUnloadEnabled()) {
+    --class_loader_ref_count;
+    if (plugin_ref_count_ <= 0 && isOnDemandLoadUnloadEnabled()) {
       if (!ClassLoader::hasUnmanagedInstanceBeenCreated()) {
-        unloadLibraryInternal(false);
+        if (class_loader_ref_count == 0) {
+          unloadLibraryInternal(false);
+        }
+        if (remove_when_possible) {
+          delete this;
+        }
       } else {
         CONSOLE_BRIDGE_logWarn(
           "class_loader::ClassLoader: "
@@ -331,7 +347,7 @@ class ClassLoader
       std::lock_guard<std::recursive_mutex> lock(plugin_ref_count_mutex_);
       ++plugin_ref_count_;
     }
-
+    class_loader_ref_count++;
     return obj;
   }
 
@@ -365,6 +381,8 @@ class ClassLoader
   int plugin_ref_count_;
   std::recursive_mutex plugin_ref_count_mutex_;
   static bool has_unmananged_instance_been_created_;
+  unsigned int class_loader_ref_count;
+  bool remove_when_possible;
 };
 
 }  // namespace class_loader

src/class_loader.cpp

@@ -55,7 +55,9 @@ ClassLoader::ClassLoader(const std::string & library_path, bool ondemand_load_un
 : ondemand_load_unload_(ondemand_load_unload),
   library_path_(library_path),
   load_ref_count_(0),
-  plugin_ref_count_(0)
+  plugin_ref_count_(0),
+  class_loader_ref_count(0),
+  remove_when_possible(false)
 {
   CONSOLE_BRIDGE_logDebug(
     "class_loader.ClassLoader: "

src/class_loader_core.cpp

@@ -545,6 +545,7 @@ void unloadLibrary(const std::string & library_path, ClassLoader * loader)
             ", keeping library %s open.",
             library_path.c_str());
         }
+        purgeGraveyardOfMetaobjects(library_path, loader, true);
         return;
       } catch (const std::runtime_error & e) {
         throw class_loader::LibraryUnloadException(

src/meta_object.cpp

@@ -71,6 +71,9 @@ AbstractMetaObjectBase::~AbstractMetaObjectBase()
     "class_loader.impl.AbstractMetaObjectBase: "
     "Destroying MetaObject %p (base = %s, derived = %s, library path = %s)",
     this, baseClassName().c_str(), className().c_str(), getAssociatedLibraryPath().c_str());
+  for (unsigned int i = 0; i < impl_->associated_class_loaders_.size(); i++) {
+    delete impl_->associated_class_loaders_[i];
+  }
   delete impl_;
 }
 

src/multi_library_class_loader.cpp

@@ -54,6 +54,11 @@ MultiLibraryClassLoader::MultiLibraryClassLoader(bool enable_ondemand_loadunload
 MultiLibraryClassLoader::~MultiLibraryClassLoader()
 {
   shutdownAllClassLoaders();
+  for (auto & loader : impl_->active_class_loaders_) {
+    if (loader.second) {
+      loader.second->removeWhenPosible();
+    }
+  }
   delete impl_;
 }