Changeset 10468

Timestamp:

May 25, 2015, 12:13:27 PM (10 years ago)

Author:

landauf

Message:

moved static content of NetworkFunctionBase to NetworkFunctionManager

Location:

code/branches/core7/src

Files:

• libraries/network/CMakeLists.txt (modified) (2 diffs)
• libraries/network/NetworkFunction.cc (modified) (2 diffs)
• libraries/network/NetworkFunction.h (modified) (1 diff)
• libraries/network/NetworkFunctionManager.cc (added)
• libraries/network/NetworkFunctionManager.h (added)
• libraries/network/packet/FunctionIDs.cc (modified) (2 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/core7/src/libraries/network/CMakeLists.txt

@@ -34 +34 @@
   MasterServerComm.cc
   NetworkFunction.cc
+  NetworkFunctionManager.cc
   Host.cc
   Server.cc
@@ -61 +62 @@
   NetworkChatListener.h
   NetworkFunction.h
+  NetworkFunctionManager.h
   NetworkPrecompiledHeaders.h
   NetworkPrereqs.h

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

@@ -28 +28 @@
 
 #include "NetworkFunction.h"
+#include "NetworkFunctionManager.h"
 #include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-  std::map<uint32_t, bool> NetworkFunctionBase::isStaticMap_;
-
   std::map<NetworkFunctionPointer, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::functorMap_;
   std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
@@ -50 +49 @@
 
     this->name_ = name;
-    NetworkFunctionBase::getNameMap()[name] = this;
+    NetworkFunctionManager::getNameMap()[name] = this;
   }
   NetworkFunctionBase::~NetworkFunctionBase()
   {
-  }
-
-
-  void NetworkFunctionBase::destroyAllNetworkFunctions()
-  {
-    std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
-    std::map<std::string, NetworkFunctionBase*>::iterator it;
-    for( it=map.begin(); it!=map.end(); ++it )
-      delete it->second;
-  }
-
-
-  /*static*/ std::map<std::string, NetworkFunctionBase*>& NetworkFunctionBase::getNameMap()
-  {
-    static std::map<std::string, NetworkFunctionBase*> nameMap_;
-    return nameMap_;
   }
 

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

@@ -77 +77 @@
     inline uint32_t     getNetworkID() const            { return this->networkID_; }
     inline const std::string& getName() const           { return name_; }
-    static inline bool  isStatic( uint32_t networkID )  { return isStaticMap_[networkID]; }
-
-    static inline void setNetworkID(const std::string& name, uint32_t id)
-    {
-        std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
-        assert( map.find(name)!=map.end() );
-        map[name]->setNetworkID(id);
-    }
-
-    static void destroyAllNetworkFunctions();
-
-  protected:
-    static std::map<uint32_t, bool> isStaticMap_;
-
-  private:
-    static std::map<std::string, NetworkFunctionBase*>& getNameMap();
+
+  private:
     uint32_t networkID_;
     std::string name_;

code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

@@ -37 +37 @@
 #include "core/object/ObjectList.h"
 #include "network/NetworkFunction.h"
+#include "network/NetworkFunctionManager.h"
 
 namespace orxonox {
@@ -138 +139 @@
     functionname = temp+2*sizeof(uint32_t);
     orxout(internal_info, context::packets) << "processing functionid: " << networkID << " name: " << functionname << endl;
-    NetworkFunctionBase::setNetworkID((const char*)functionname, networkID);
+    NetworkFunctionManager::setNetworkID((const char*)functionname, networkID);
     temp += 2*sizeof(uint32_t) + stringsize;
   }

code/branches/core7/src/orxonox/gamestates/GSRoot.cc

@@ -35 +35 @@
 #include "core/command/ConsoleCommandIncludes.h"
 #include "network/NetworkFunctionIncludes.h"
+#include "network/NetworkFunctionManager.h"
 #include "tools/Timer.h"
 #include "tools/interfaces/Tickable.h"
@@ -68 +69 @@
     GSRoot::~GSRoot()
     {
-        NetworkFunctionBase::destroyAllNetworkFunctions();
+        NetworkFunctionManager::destroyAllNetworkFunctions();
     }