Changeset 10517 for code/branches/core7

Timestamp:

May 31, 2015, 10:54:39 AM (9 years ago)

Author:

landauf

Message:

activating a scopelistener right after registering may not be the best idea after all because some other stuff (e.g. an identifier) may not yet be registered if this happens during static initialization. added helper function instead (not yet used, but this will soon happen)

Location:

code/branches/core7/src/libraries/core/singleton

Files:

• ScopeManager.cc (modified) (3 diffs)
• ScopeManager.h (modified) (1 diff)

code/branches/core7/src/libraries/core/singleton/ScopeManager.cc

@@ -64 +64 @@
     {
         this->listeners_[scope].insert(listener);
-        if (this->isActive(scope))
-            this->activateListener(listener);
     }
 
     void ScopeManager::removeListener(ScopeListener* listener, ScopeID::Value scope)
     {
-        if (this->isActive(scope))
-            this->deactivateListener(listener);
         this->listeners_[scope].erase(listener);
     }
@@ -84 +80 @@
     {
         for (std::set<ScopeListener*>::iterator it = this->listeners_[scope].begin(); it != this->listeners_[scope].end(); ++it)
-            this->deactivateListener(*it);
+            if ((*it)->bActivated_)
+                this->deactivateListener(*it);
     }
 
@@ -95 +92 @@
     void ScopeManager::deactivateListener(ScopeListener* listener)
     {
-        if (listener->bActivated_)
+        try
+            { listener->deactivated(); }
+        catch (...)
+            { orxout(internal_warning) << "ScopeListener::deactivated() failed! This MUST NOT happen, fix it!" << endl; }
+        listener->bActivated_ = false;
+    }
+
+    void ScopeManager::updateListeners()
+    {
+        std::map<ScopeID::Value, std::set<ScopeListener*> >::iterator it1;
+        for (it1 = this->listeners_.begin(); it1 != this->listeners_.end(); ++it1)
         {
-            try
-                { listener->deactivated(); }
-            catch (...)
-                { orxout(internal_warning) << "ScopeListener::deactivated() failed! This MUST NOT happen, fix it!" << endl; }
-            listener->bActivated_ = false;
+            const ScopeID::Value& scope = it1->first;
+            const std::set<ScopeListener*>& listeners = it1->second;
+
+            bool scopeIsActive = this->isActive(scope);
+            for (std::set<ScopeListener*>::const_iterator it2 = listeners.begin(); it2 != listeners.end(); ++it2)
+            {
+                ScopeListener* listener = (*it2);
+
+                if (scopeIsActive && !listener->bActivated_)
+                    this->activateListener(listener);
+                else if (!scopeIsActive && listener->bActivated_)
+                    this->deactivateListener(listener);
+            }
         }
     }

code/branches/core7/src/libraries/core/singleton/ScopeManager.h

@@ -64 +64 @@
             bool isActive(ScopeID::Value scope);
 
-            /** Registers a listener for the given scope. If the scope is already active, the listener is activate immediately. */
+            /** Registers a listener for the given scope. */
             void addListener(ScopeListener* listener, ScopeID::Value scope);
-            /** Unregisters a listener for the given scope. If the scope is still active, the listener is deactivated before removal. */
+            /** Unregisters a listener for the given scope. */
             void removeListener(ScopeListener* listener, ScopeID::Value scope);
+
+            /**
+             * Checks for all listeners if their activity matches the activity of the scope.
+             * If not, listeners are activated or deactivated depending on their state.
+             */
+            void updateListeners();
 
         private: