Changeset 5867 for code/branches/core5/src/libraries

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:

code/branches/core5/src/libraries

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/Core.cc (modified) (3 diffs)
• core/ScopedSingletonManager.cc (added)
• core/ScopedSingletonManager.h (added)
• util/Scope.h (modified) (2 diffs)
• util/ScopedSingleton.h (deleted)
• util/Singleton.h (modified) (1 diff)

code/branches/core5/src/libraries/core/CMakeLists.txt

@@ -37 +37 @@
   PathConfig.cc
   Resource.cc
+  ScopedSingletonManager.cc
   WindowEventListener.cc
 

code/branches/core5/src/libraries/core/Core.cc

@@ -65 +65 @@
 #include "Language.h"
 #include "LuaState.h"
+#include "ScopedSingletonManager.h"
 #include "Shell.h"
 #include "TclBind.h"
@@ -433 +434 @@
     {
         // singletons from other libraries
-        Scope<ScopeID::Root>::update(time);
+        ScopedSingletonManager::update(time, ScopeID::Root);
         if (this->bGraphicsLoaded_)
         {
@@ -441 +442 @@
             this->guiManager_->update(time);
             // graphics singletons from other libraries
-            Scope<ScopeID::Graphics>::update(time);
+            ScopedSingletonManager::update(time, ScopeID::Graphics);
         }
         // process thread commands

code/branches/core5/src/libraries/util/Scope.h

@@ -73 +73 @@
             //! Gets called if the scope is deactivated
             virtual void deactivated() = 0;
-            //! Gets called if the scope is updated
-            virtual void updated(const Clock& time) = 0;
 
         private:
@@ -124 +122 @@
                 return (ScopeManager::instanceCounts_s[scope] > 0);
             }
-
-            //! Update method for the ScopeListeners (to implement singleton updates)
-            static void update(const Clock& time)
-            {
-                if (isActive())
-                {
-                    for (typename std::set<ScopeListener*>::iterator it = ScopeManager::listeners_s[scope].begin(); it != ScopeManager::listeners_s[scope].end(); )
-                        (*(it++))->updated(time);
-                }
-            }
     };
 }

code/branches/core5/src/libraries/util/Singleton.h

@@ -55 +55 @@
         }
 
+        //! Update method called by ClassSingletonManager (if used)
+        void updateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->update(time); }
+        //! Empty update method for the static polymorphism
+        void update(const Clock& time) { }
+
     protected:
         //! Constructor sets the singleton instance pointer