Changeset 10542 for code/branches/core7/src/libraries/network

Timestamp:

Jun 7, 2015, 2:16:55 PM (10 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/network

Files:

• NetworkFunctionManager.cc (modified) (1 diff)
• NetworkFunctionManager.h (modified) (2 diffs)
• NetworkStaticInitializationHandler.cc (modified) (2 diffs)

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();
     }