Changeset 8423 for code/trunk/src/libraries/core/Core.h

Timestamp:

May 9, 2011, 5:06:49 AM (13 years ago)

Author:

rgrieder

Message:

Added and incorporated new class DestructionHelper: instead of doing the destruction of certain singletons implicitly via scoped_ptrs and ScopeGuards, use a method named destroy() that essentially achieves the same, but makes the destruction sequence obvious.

File:

• code/trunk/src/libraries/core/Core.h (modified) (4 diffs)

code/trunk/src/libraries/core/Core.h

@@ -45 +45 @@
 
 #include <string>
-#include <boost/scoped_ptr.hpp>
 #include <loki/ScopeGuard.h>
 
+#include "util/DestructionHelper.h"
 #include "util/Singleton.h"
 #include "OrxonoxClass.h"
@@ -61 +61 @@
     class _CoreExport Core : public Singleton<Core>, public OrxonoxClass
     {
-        typedef Loki::ScopeGuardImpl0<void (*)()> SimpleScopeGuard;
         friend class Singleton<Core>;
         friend class Game;
@@ -74 +73 @@
             */
             Core(const std::string& cmdLine);
-            ~Core();
+
+            /// Leave empty and use destroy() instead
+            ~Core() {}
+            /// Destructor that also executes when the object fails to construct
+            void destroy();
 
             void setConfigValues();
@@ -108 +111 @@
 
             void setThreadAffinity(int limitToCPU);
-            // MANAGED SINGLETONS/OBJECTS
-            // Mind the order for the destruction!
-            scoped_ptr<PathConfig>        pathConfig_;
-            scoped_ptr<DynLibManager>     dynLibManager_;
-            scoped_ptr<SignalHandler>     signalHandler_;
-            SimpleScopeGuard              identifierDestroyer_;
-            SimpleScopeGuard              consoleCommandDestroyer_;
-            scoped_ptr<ConfigFileManager> configFileManager_;
-            scoped_ptr<Language>          languageInstance_;
-            scoped_ptr<IOConsole>         ioConsole_;
-            scoped_ptr<TclBind>           tclBind_;
-            scoped_ptr<TclThreadManager>  tclThreadManager_;
-            scoped_ptr<Scope<ScopeID::Root> > rootScope_;
+
+            PathConfig*               pathConfig_;
+            DynLibManager*            dynLibManager_;
+            SignalHandler*            signalHandler_;
+            ConfigFileManager*        configFileManager_;
+            Language*                 languageInstance_;
+            IOConsole*                ioConsole_;
+            TclBind*                  tclBind_;
+            TclThreadManager*         tclThreadManager_;
+            Scope<ScopeID::Root>*     rootScope_;
             // graphical
-            scoped_ptr<GraphicsManager>   graphicsManager_;     //!< Interface to OGRE
-            scoped_ptr<InputManager>      inputManager_;        //!< Interface to OIS
-            scoped_ptr<GUIManager>        guiManager_;          //!< Interface to GUI
-            scoped_ptr<Scope<ScopeID::Graphics> > graphicsScope_;
+            GraphicsManager*          graphicsManager_;            //!< Interface to OGRE
+            InputManager*             inputManager_;               //!< Interface to OIS
+            GUIManager*               guiManager_;                 //!< Interface to GUI
+            Scope<ScopeID::Graphics>* graphicsScope_;
 
-            bool                          bGraphicsLoaded_;
-            int                           softDebugLevelLogFile_;      //!< The debug level for the log file (belongs to OutputHandler)
-            std::string                   language_;                   //!< The language
-            bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
-            bool                          bStartIOConsole_;            //!< Set to false if you don't want to use the IOConsole
-            long long                     lastLevelTimestamp_;         ///< Timestamp when the last level was started
-            long long                     ogreConfigTimestamp_;        ///< Timestamp wehen the ogre config level was modified
-            bool                          bDevMode_;                   //!< Developers bit. If set to false, some options are not available as to not confuse the normal user.
+            bool                      bGraphicsLoaded_;
+            int                       softDebugLevelLogFile_;      //!< The debug level for the log file (belongs to OutputHandler)
+            std::string               language_;                   //!< The language
+            bool                      bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
+            bool                      bStartIOConsole_;            //!< Set to false if you don't want to use the IOConsole
+            long long                 lastLevelTimestamp_;         ///< Timestamp when the last level was started
+            long long                 ogreConfigTimestamp_;        ///< Timestamp wehen the ogre config level was modified
+            bool                      bDevMode_;                   //!< Developers bit. If set to false, some options are not available as to not confuse the normal user.
 
-            static Core*                  singletonPtr_s;
+            /// Helper object that executes the surrogate destructor destroy()
+            DestructionHelper<Core>   destructionHelper_;
+
+            static Core*              singletonPtr_s;
     };
 }