Changeset 10542 for code/branches/core7/src

Timestamp:

Jun 7, 2015, 2:16:55 PM (9 years ago)

Author:

landauf

Message:

clean and explicit setup/shutdown of singletons that are used by statically initialized instances

Location:

code/branches/core7/src/libraries

Files:

• core/Core.cc (modified) (4 diffs)
• core/CoreStaticInitializationHandler.cc (modified) (2 diffs)
• core/class/IdentifierManager.cc (modified) (1 diff)
• core/class/IdentifierManager.h (modified) (3 diffs)
• core/command/ConsoleCommandManager.cc (modified) (1 diff)
• core/command/ConsoleCommandManager.h (modified) (3 diffs)
• core/commandline/CommandLineParser.cc (modified) (7 diffs)
• core/commandline/CommandLineParser.h (modified) (5 diffs)
• core/module/StaticInitializationManager.cc (modified) (2 diffs)
• core/module/StaticInitializationManager.h (modified) (2 diffs)
• core/singleton/ScopeManager.cc (modified) (1 diff)
• core/singleton/ScopeManager.h (modified) (3 diffs)
• network/NetworkFunctionManager.cc (modified) (1 diff)
• network/NetworkFunctionManager.h (modified) (2 diffs)
• network/NetworkStaticInitializationHandler.cc (modified) (2 diffs)

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

@@ -58 +58 @@
 #include "util/output/OutputManager.h"
 #include "core/singleton/Scope.h"
-#include "core/singleton/ScopedSingletonIncludes.h"
 #include "ApplicationPaths.h"
 #include "ConfigurablePaths.h"
@@ -66 +65 @@
 #include "GraphicsManager.h"
 #include "GUIManager.h"
-#include "class/Identifier.h"
 #include "Language.h"
 #include "Loader.h"
 #include "LuaState.h"
-#include "command/ConsoleCommandManager.h"
 #include "command/IOConsole.h"
 #include "command/TclBind.h"
@@ -127 +124 @@
 
         // TODO: initialize Root-Context
-        // TODO: initialize IdentifierManager here
-        // TODO: initialize ScopeManager here
-        // TODO: initialize CommandLineParser here
-        // TODO: initialize ConsoleCommandManager here
-        // TODO: initialize NetworkFunctionManager here
-        // TODO: initialize StaticInitializationManager
+        new StaticInitializationManager(); // create singleton
         this->staticInitHandler_ = new CoreStaticInitializationHandler();
         StaticInitializationManager::getInstance().addHandler(this->staticInitHandler_);
@@ -262 +254 @@
         safeObjectDelete(&rootModule_);
         safeObjectDelete(&staticInitHandler_);
+        delete &StaticInitializationManager::getInstance();
         safeObjectDelete(&dynLibManager_);
         safeObjectDelete(&configurablePaths_);

code/branches/core7/src/libraries/core/CoreStaticInitializationHandler.cc

@@ -31 +31 @@
 #include "CoreIncludes.h"
 #include "module/ModuleInstance.h"
+#include "object/Iterator.h"
 #include "class/IdentifierManager.h"
-#include "object/Iterator.h"
+#include "singleton/ScopeManager.h"
+#include "command/ConsoleCommandManager.h"
+#include "commandline/CommandLineParser.h"
 
 namespace orxonox
@@ -38 +41 @@
     void CoreStaticInitializationHandler::setupHandler()
     {
-        // TODO
+        // initialize singletons
+        new IdentifierManager();
+        new ScopeManager();
+        new CommandLineParser();
+        new ConsoleCommandManager();
     }
 
     void CoreStaticInitializationHandler::shutdownHandler()
     {
-        // TODO
+        delete &ConsoleCommandManager::getInstance();
+        delete &CommandLineParser::getInstance();
+        delete &ScopeManager::getInstance();
+        delete &IdentifierManager::getInstance();
     }
 

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    /* static */ IdentifierManager& IdentifierManager::getInstance()
-    {
-        static IdentifierManager instance;
-        return instance;
-    }
+    IdentifierManager* IdentifierManager::singletonPtr_s = 0;
 
     IdentifierManager::IdentifierManager()

code/branches/core7/src/libraries/core/class/IdentifierManager.h

@@ -42 +42 @@
 #include <string>
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
-    class _CoreExport IdentifierManager
+    class _CoreExport IdentifierManager : public Singleton<IdentifierManager>
     {
+        friend class Singleton<IdentifierManager>;
+
         public:
-            static IdentifierManager& getInstance();
+            IdentifierManager();
+            ~IdentifierManager() {}
 
             void addIdentifier(Identifier* identifier);
@@ -88 +93 @@
 
         private:
-            IdentifierManager();
-            IdentifierManager(const IdentifierManager&);
-            ~IdentifierManager() {}
+            IdentifierManager(const IdentifierManager&); // not implemented
 
             /// Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.
@@ -110 +113 @@
             std::map<Identifiable*, std::list<const Identifier*> > identifierTraceOfNewObject_;
             Identifier* recordTraceForIdentifier_; //!< The identifier for which we want to record the trace of identifiers during object creation. If null, no trace is recorded.
+
+            static IdentifierManager* singletonPtr_s;
     };
 }

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    /* static */ ConsoleCommandManager& ConsoleCommandManager::getInstance()
-    {
-        static ConsoleCommandManager instance;
-        return instance;
-    }
+    ConsoleCommandManager* ConsoleCommandManager::singletonPtr_s = 0;
 
     /**

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h

@@ -37 +37 @@
 #include "core/CorePrereqs.h"
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
@@ -42 +44 @@
      * A singleton that stores all existing ConsoleCommands.
      */
-    class _CoreExport ConsoleCommandManager
+    class _CoreExport ConsoleCommandManager : public Singleton<ConsoleCommandManager>
     {
+        friend class Singleton<ConsoleCommandManager>;
+
         public:
-            static ConsoleCommandManager& getInstance();
-
             void registerCommand(ConsoleCommand* command);
             void registerCommand(const std::string& group, const std::string& name, ConsoleCommand* command);
@@ -71 +73 @@
             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMap_;
             std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMapLC_;
+
+            static ConsoleCommandManager* singletonPtr_s;
     };
 }

code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc

@@ -40 +40 @@
 namespace orxonox
 {
+    CommandLineParser* CommandLineParser::singletonPtr_s = 0;
+
     /**
     @brief
@@ -85 +87 @@
     CommandLineParser::~CommandLineParser()
     {
-    }
-
-    /**
-    @brief
-        Returns a unique instance (Meyers Singleton).
-    */
-    CommandLineParser& CommandLineParser::_getInstance()
-    {
-        static CommandLineParser instance;
-        return instance;
     }
 
@@ -260 +252 @@
     std::string CommandLineParser::getUsageInformation()
     {
-        CommandLineParser& inst = _getInstance();
+        CommandLineParser& inst = getInstance();
         std::ostringstream infoStr;
 
@@ -313 +305 @@
     const CommandLineArgument* CommandLineParser::getArgument(const std::string& name)
     {
-        std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.find(name);
-        if (it == _getInstance().cmdLineArgs_.end())
+        std::map<std::string, CommandLineArgument*>::const_iterator it = getInstance().cmdLineArgs_.find(name);
+        if (it == getInstance().cmdLineArgs_.end())
         {
             ThrowException(Argument, "Could find command line argument '" + name + "'.");
@@ -331 +323 @@
     void CommandLineParser::addArgument(CommandLineArgument* argument)
     {
-        OrxAssert(!_getInstance().existsArgument(argument->getName()),
+        OrxAssert(!getInstance().existsArgument(argument->getName()),
             "Cannot add a command line argument with name '" + argument->getName() + "' twice.");
         OrxAssert(!argument->getDefaultValue().isType<bool>() || argument->getDefaultValue().get<bool>() != true,
@@ -337 +329 @@
             << "Please use SetCommandLineSwitch and adjust your argument: " << argument->getName());
 
-        _getInstance().cmdLineArgs_[argument->getName()] = argument;
+        getInstance().cmdLineArgs_[argument->getName()] = argument;
     }
 
@@ -345 +337 @@
     void CommandLineParser::removeArgument(CommandLineArgument* argument)
     {
-        _getInstance().cmdLineArgs_.erase(argument->getName());
+        getInstance().cmdLineArgs_.erase(argument->getName());
     }
 }

code/branches/core7/src/libraries/core/commandline/CommandLineParser.h

@@ -48 +48 @@
 #include "util/OrxAssert.h"
 #include "util/MultiType.h"
+#include "util/Singleton.h"
 
 namespace orxonox
@@ -134 +135 @@
         CommandLineArgument
     */
-    class _CoreExport CommandLineParser
+    class _CoreExport CommandLineParser : public Singleton<CommandLineParser>
     {
+        friend class Singleton<CommandLineParser>;
+
     public:
+        //! Constructor initialises bFirstTimeParse_ with true.
+        CommandLineParser() : bFirstTimeParse_(true) { }
+        ~CommandLineParser();
 
         //! Parse redirection to internal member method.
         static void parse(const std::string& cmdLine)
-        { _getInstance()._parse(cmdLine); }
+        { getInstance()._parse(cmdLine); }
 
         static std::string getUsageInformation();
@@ -157 +163 @@
         static bool existsArgument(const std::string& name)
         {
-            std::map<std::string, CommandLineArgument*>::const_iterator it = _getInstance().cmdLineArgs_.find(name);
-            return !(it == _getInstance().cmdLineArgs_.end());
+            std::map<std::string, CommandLineArgument*>::const_iterator it = getInstance().cmdLineArgs_.find(name);
+            return !(it == getInstance().cmdLineArgs_.end());
         }
 
@@ -164 +170 @@
 
     private:
-        //! Constructor initialises bFirstTimeParse_ with true.
-        CommandLineParser() : bFirstTimeParse_(true) { }
         //! Undefined copy constructor
         CommandLineParser(const CommandLineParser& instance);
-        ~CommandLineParser();
-
-        static CommandLineParser& _getInstance();
 
         void _parse(const std::string& cmdLine);
@@ -187 +188 @@
         //! Search map by shortcut for the arguments.
         std::map<std::string, CommandLineArgument*> cmdLineArgsShortcut_;
+
+        static CommandLineParser* singletonPtr_s;
     };
 

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

@@ -33 +33 @@
 namespace orxonox
 {
-    /* static */ StaticInitializationManager& StaticInitializationManager::getInstance()
-    {
-        static StaticInitializationManager instance;
-        return instance;
-    }
+    StaticInitializationManager* StaticInitializationManager::singletonPtr_s = 0;
 
     void StaticInitializationManager::addHandler(StaticInitializationHandler* handler)
     {
+        handler->setupHandler();
         this->handlers_.push_back(handler);
     }
@@ -47 +44 @@
     {
         this->handlers_.remove(handler);
+        handler->shutdownHandler();
     }
 

code/branches/core7/src/libraries/core/module/StaticInitializationManager.h

@@ -34 +34 @@
 #include <list>
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
-    class _CoreExport StaticInitializationManager
+    class _CoreExport StaticInitializationManager : public Singleton<StaticInitializationManager>
     {
+        friend class Singleton<StaticInitializationManager>;
+
         public:
-            static StaticInitializationManager& getInstance();
-
             StaticInitializationManager() {}
             virtual ~StaticInitializationManager() {}
@@ -52 +54 @@
         private:
             std::list<StaticInitializationHandler*> handlers_;
+
+            static StaticInitializationManager* singletonPtr_s;
     };
 }

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

@@ -38 +38 @@
 namespace orxonox
 {
-    /* static */ ScopeManager& ScopeManager::getInstance()
-    {
-        static ScopeManager instance;
-        return instance;
-    }
+    ScopeManager* ScopeManager::singletonPtr_s = 0;
 
     void ScopeManager::addScope(ScopeID::Value scope)

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

@@ -41 +41 @@
 #include <set>
 
+#include "util/Singleton.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
         @see See @ref Scope "this description" for details about the interrelationship of Scope, ScopeListener, and ScopeManager.
     */
-    class _CoreExport ScopeManager
+    class _CoreExport ScopeManager : public Singleton<ScopeManager>
     {
+        friend class Singleton<ScopeManager>;
+
         public:
-            static ScopeManager& getInstance();
-
             /** Adds a scope and activates all listeners which are registered for this scope */
             void addScope(ScopeID::Value scope);
@@ -78 +80 @@
             std::set<ScopeID::Value> activeScopes_;
             std::map<ScopeID::Value, std::set<ScopeListener*> > listeners_; //!< Stores all listeners for a scope
+
+            static ScopeManager* singletonPtr_s;
     };
 }

code/branches/core7/src/libraries/network/NetworkFunctionManager.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    /* static */NetworkFunctionManager& NetworkFunctionManager::getInstance()
-    {
-        static NetworkFunctionManager instance;
-        return instance;
-    }
+    NetworkFunctionManager* NetworkFunctionManager::singletonPtr_s = 0;
 
     void NetworkFunctionManager::registerFunction(NetworkFunctionBase* function)

code/branches/core7/src/libraries/network/NetworkFunctionManager.h

@@ -36 +36 @@
 #include <set>
 
+#include "util/Singleton.h"
+#include "NetworkFunction.h"
+
 namespace orxonox
 {
-    class _NetworkExport NetworkFunctionManager
+    class _NetworkExport NetworkFunctionManager : public Singleton<NetworkFunctionManager>
     {
+        friend class Singleton<NetworkFunctionManager>;
+
         public:
-            static NetworkFunctionManager& getInstance();
-
             void registerFunction(NetworkFunctionBase* function);
             void unregisterFunction(NetworkFunctionBase* function);
@@ -58 +61 @@
             std::map<NetworkFunctionPointer, NetworkFunctionBase*> functorMap_;
             std::map<uint32_t, NetworkFunctionBase*> idMap_;
+
+            static NetworkFunctionManager* singletonPtr_s;
     };
 }

code/branches/core7/src/libraries/network/NetworkStaticInitializationHandler.cc

@@ -30 +30 @@
 
 #include "core/module/ModuleInstance.h"
+#include "NetworkFunctionManager.h"
 
 namespace orxonox
@@ -35 +36 @@
     void NetworkStaticInitializationHandler::setupHandler()
     {
-        // TODO
+        // initialize singleton
+        new NetworkFunctionManager();
     }
 
     void NetworkStaticInitializationHandler::shutdownHandler()
     {
-        // TODO
+        delete &NetworkFunctionManager::getInstance();
     }