Changeset 11014 for code/trunk/src/libraries/core/module

Timestamp:

Jan 2, 2016, 3:15:04 PM (9 years ago)

Author:

landauf

Message:

moved code for loading/unloading a plugin into separate functions

Location:

code/trunk/src/libraries/core/module

Files:

• Plugin.cc (modified) (2 diffs)
• Plugin.h (modified) (1 diff)
• PluginManager.cc (modified) (2 diffs)

code/trunk/src/libraries/core/module/Plugin.cc

@@ -44 +44 @@
     {
         if (this->moduleInstance_ != NULL)
-        {
-            this->referenceCounter_ = 1; // force unloading
             this->unload();
-        }
     }
 
-    void Plugin::load()
+    void Plugin::reference()
     {
         this->referenceCounter_++;
         if (this->referenceCounter_ == 1) // increased from 0 to 1 -> load plugin
-        {
-            orxout(internal_info) << "Loading plugin " << this->name_ << "..." << endl;
-            this->moduleInstance_ = new ModuleInstance(this->libraryName_);
-            Core::getInstance().loadModule(this->moduleInstance_);
-        }
+            this->load();
         else
             orxout(internal_info) << "Increased reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
 
-    void Plugin::unload()
+    void Plugin::dereference()
     {
         if (this->referenceCounter_ == 0)
@@ -73 +66 @@
         this->referenceCounter_--;
         if (this->referenceCounter_ == 0) // reduced from 1 to 0 -> load plugin
-        {
-            orxout(internal_info) << "Unloading plugin " << this->name_ << "..." << endl;
-            Core::getInstance().unloadModule(this->moduleInstance_);
-            delete this->moduleInstance_;
-            this->moduleInstance_ = NULL;
-        }
+            this->unload();
         else
             orxout(internal_info) << "Reduced reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
+
+    void Plugin::load()
+    {
+        orxout(internal_info) << "Loading plugin " << this->name_ << "..." << endl;
+        this->moduleInstance_ = new ModuleInstance(this->libraryName_);
+        Core::getInstance().loadModule(this->moduleInstance_);
+    }
+
+    void Plugin::unload()
+    {
+        orxout(internal_info) << "Unloading plugin " << this->name_ << "..." << endl;
+        Core::getInstance().unloadModule(this->moduleInstance_);
+        delete this->moduleInstance_;
+        this->moduleInstance_ = NULL;
+    }
 }

code/trunk/src/libraries/core/module/Plugin.h

@@ -40 +40 @@
             ~Plugin();
 
+            void reference();
+            void dereference();
+
+        private:
             void load();
             void unload();
 
-        private:
             std::string name_;
             std::string libraryName_;

code/trunk/src/libraries/core/module/PluginManager.cc

@@ -90 +90 @@
         Plugin* plugin = this->plugins_[name];
         if (plugin != NULL)
-            plugin->load();
+            plugin->reference();
         else
             orxout(internal_warning) << "Cannot find plugin with name " << name << endl;
@@ -99 +99 @@
         Plugin* plugin = this->plugins_[name];
         if (plugin != NULL)
-            plugin->unload();
+            plugin->dereference();
         else
             orxout(internal_warning) << "Cannot find plugin with name " << name << endl;