Changeset 3366 for code/branches/resource/src/util

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

Location:

code/branches/resource/src/util

Files:

• SignalHandler.cc (modified) (2 diffs)
• SignalHandler.h (modified) (5 diffs)
• Singleton.h (modified) (2 diffs)

code/branches/resource/src/util/SignalHandler.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    SignalHandler* SignalHandler::singletonRef_s = NULL;
+    SignalHandler* SignalHandler::singletonPtr_s = NULL;
 }
 
@@ -122 +122 @@
       }
       // if the signalhandler has already been destroyed then don't do anything
-      if( SignalHandler::singletonRef_s == 0 )
+      if( SignalHandler::singletonPtr_s == 0 )
       {
         COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "can't write backtrace because SignalHandler already destroyed" << std::endl;

code/branches/resource/src/util/SignalHandler.h

@@ -40 +40 @@
 #include <list>
 #include <string>
+#include "Singleton.h"
 
 namespace orxonox
@@ -67 +68 @@
     typedef std::list<SignalCallbackRec> SignalCallbackList;
 
-    class SignalHandler
+    class SignalHandler : public Singleton<SignalHandler>
     {
+        friend class Singleton<SignalHandler>;
     public:
-        SignalHandler()  { assert(SignalHandler::singletonRef_s == 0); SignalHandler::singletonRef_s = this; }
-        ~SignalHandler() { assert(SignalHandler::singletonRef_s != 0); SignalHandler::singletonRef_s = NULL; }
-        inline static SignalHandler& getInstance() { assert(SignalHandler::singletonRef_s); return *SignalHandler::singletonRef_s; }
+        SignalHandler()  { }
+        ~SignalHandler() { }
 
         void registerCallback( SignalCallback cb, void * someData );
@@ -87 +88 @@
         SignalCallbackList callbackList;
 
-        static SignalHandler* singletonRef_s;
+        static SignalHandler* singletonPtr_s;
 
         std::string appName;
@@ -98 +99 @@
 namespace orxonox
 {
-    class _UtilExport SignalHandler
+    class _UtilExport SignalHandler : public Singleton<SignalHandler>
     {
+        friend class Singleton<SignalHandler>;
     public:
-        SignalHandler()  { assert(SignalHandler::singletonRef_s == 0); SignalHandler::singletonRef_s = this; }
-        ~SignalHandler() { assert(SignalHandler::singletonRef_s != 0); SignalHandler::singletonRef_s = 0; }
-        inline static SignalHandler& getInstance() { assert(SignalHandler::singletonRef_s); return *SignalHandler::singletonRef_s; }
+        SignalHandler()  { }
+        ~SignalHandler() { }
         void doCatch( const std::string & appName, const std::string & filename ) {}
         void dontCatch() {}
@@ -109 +110 @@
 
     private:
-        static SignalHandler* singletonRef_s;
+        static SignalHandler* singletonPtr_s;
     };
 }

code/branches/resource/src/util/Singleton.h

@@ -40 +40 @@
         Usage:
         Inherit publicly from Singleton<MyClass> and provide access to
-        MyClass::singletonRef_s.
-        This can be done with a friend declaration.
+        MyClass::singletonPtr_s.
+        This can easily be done with a friend declaration.
     */
     template <class T>
@@ -50 +50 @@
         static T& getInstance()
         {
-            assert(T::singletonRef_s != NULL);
-            return *T::singletonRef_s;
+            assert(T::singletonPtr_s != NULL);
+            return *T::singletonPtr_s;
         }
 
     protected:
-        // Constructor sets the singleton instance pointer
+        //! Constructor sets the singleton instance pointer
         Singleton()
         {
-            assert(T::singletonRef_s == NULL);
-            T::singletonRef_s = static_cast<T*>(this);
+            assert(T::singletonPtr_s == NULL);
+            T::singletonPtr_s = static_cast<T*>(this);
         }
-        // Constructor resets the singleton instance pointer
+
+        //! Constructor resets the singleton instance pointer
         ~Singleton()
         {
-            assert(T::singletonRef_s != NULL);
-            T::singletonRef_s = NULL;
+            assert(T::singletonPtr_s != NULL);
+            T::singletonPtr_s = NULL;
         }