Changeset 10553 for code/branches/core7/src/libraries/core/module

Timestamp:

Aug 28, 2015, 10:35:51 PM (9 years ago)

Author:

landauf

Message:

fixed reference counting in unload() - unsigned int cannot be < 0

File:

• code/branches/core7/src/libraries/core/module/Plugin.cc (modified) (3 diffs)

code/branches/core7/src/libraries/core/module/Plugin.cc

@@ -52 +52 @@
     void Plugin::load()
     {
-        if (this->referenceCounter_ == 0)
+        this->referenceCounter_++;
+        if (this->referenceCounter_ == 1) // increased from 0 to 1 -> load plugin
         {
             orxout(internal_info) << "Loading plugin " << this->name_ << "..." << endl;
@@ -59 +60 @@
         }
         else
-        {
-            orxout(internal_info) << "Plugin " << this->name_ << " is already referenced" << endl;
-        }
-
-        this->referenceCounter_++;
+            orxout(internal_info) << "Increased reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
 
     void Plugin::unload()
     {
+        if (this->referenceCounter_ == 0)
+        {
+            orxout(internal_warning) << "Tried to dereference plugin " << this->name_ << " more often than it was referenced" << endl;
+            return;
+        }
+
         this->referenceCounter_--;
-        if (this->referenceCounter_ == 0)
+        if (this->referenceCounter_ == 0) // reduced from 1 to 0 -> load plugin
         {
             orxout(internal_info) << "Unloading plugin " << this->name_ << "..." << endl;
@@ -76 +79 @@
             this->moduleInstance_ = NULL;
         }
-        else if (this->referenceCounter_ > 0)
-        {
-            orxout(internal_info) << "Plugin " << this->name_ << " is still referenced" << endl;
-        }
         else
-        {
-            orxout(internal_warning) << "Plugin " << this->name_ << " was dereferenced more often than it was reference" << endl;
-            this->referenceCounter_ = 0;
-        }
+            orxout(internal_info) << "Reduced reference count for plugin " << this->name_ << " to " << this->referenceCounter_ << endl;
     }
 }