Changeset 3227

Timestamp:

Jun 23, 2009, 8:53:51 PM (15 years ago)

Author:

scheusso

Message:

some cleaning up and memory leak fixes

Location:

code/branches/netp6/src

Files:

• network/CMakeLists.txt (modified) (1 diff)
• network/GamestateClient.cc (modified) (1 diff)
• network/GamestateClient.h (modified) (1 diff)
• network/GamestateManager.cc (modified) (1 diff)
• network/NetworkPrereqs.h (modified) (1 diff)
• network/PacketBuffer.cc (deleted)
• network/PacketBuffer.h (deleted)
• network/synchronisable/Synchronisable.h (modified) (1 diff)
• network/synchronisable/SynchronisableSpecialisations.cc (modified) (1 diff)
• util/Serialise.h (modified) (2 diffs)

code/branches/netp6/src/network/CMakeLists.txt

@@ -31 +31 @@
   NetworkFunction.cc
   Host.cc
-  PacketBuffer.cc
   Server.cc
   ServerConnection.cc

code/branches/netp6/src/network/GamestateClient.cc

@@ -52 +52 @@
 
   GamestateClient::~GamestateClient() {
+      std::map<unsigned int, packet::Gamestate *>::iterator it;
+      for ( it = this->gamestateMap_.begin(); it != this->gamestateMap_.end(); ++it )
+          delete (*it).second;
+      if( this->tempGamestate_ )
+          delete this->tempGamestate_;
   }
 

code/branches/netp6/src/network/GamestateClient.h

@@ -73 +73 @@
     std::map<unsigned int, packet::Gamestate *> gamestateMap_;
     packet::Gamestate *tempGamestate_; // we save the received gamestates here during processQueue
-    unsigned char *shipCache_;
 
   };

code/branches/netp6/src/network/GamestateManager.cc

@@ -61 +61 @@
   {
     if( this->reference )
-      delete this->reference;
-    for( std::map<unsigned int, packet::Gamestate*>::iterator it = gamestateQueue.begin(); it != gamestateQueue.end(); it++ )
+        delete this->reference;std::map<unsigned int, packet::Gamestate*>::iterator it;
+    for( it = gamestateQueue.begin(); it != gamestateQueue.end(); ++it )
       delete (*it).second;
+    std::map<unsigned int, std::map<unsigned int, packet::Gamestate*> >::iterator it1;
+    std::map<unsigned int, packet::Gamestate*>::iterator it2;
+    for( it1 = gamestateMap_.begin(); it1 != gamestateMap_.end(); ++it1 )
+    {
+      for( it2 = it1->second.begin(); it2 != it1->second.end(); ++it2 )
+        delete (*it2).second;
+    }
     delete trafficControl_;
   }

code/branches/netp6/src/network/NetworkPrereqs.h

@@ -102 +102 @@
   template <class T> class NetworkMemeberFunction;
   struct NetworkFunctionPointer;
-  class PacketBuffer;
   class Server;
   class ServerConnection;

code/branches/netp6/src/network/synchronisable/Synchronisable.h

@@ -43 +43 @@
 #include "NetworkCallback.h"
 
-/*#define REGISTERDATA(varname, ...) \
-    registerVariable((void*)&varname, sizeof(varname), DATA, __VA_ARGS__)
-#define REGISTERSTRING(stringname, ...) \
-    registerVariable(&stringname, stringname.length()+1, STRING, __VA_ARGS__)*/
 
 namespace orxonox

code/branches/netp6/src/network/synchronisable/SynchronisableSpecialisations.cc

@@ -73 +73 @@
     registerVariable(variable.y, mode, cb, bidirectional);
   }
-//   template <> void Synchronisable::registerVariable( Vector2& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)
-//   {
-//     registerVariable( (const ColourValue&)variable, mode, cb, bidirectional);
-//   }
   
   template <> void Synchronisable::registerVariable( const Vector3& variable, uint8_t mode, NetworkCallbackBase* cb, bool bidirectional)

code/branches/netp6/src/util/Serialise.h

@@ -408 +408 @@
     template <> inline void loadAndIncrease( const std::string& variable, uint8_t*& mem )
     {
-        *(std::string*)( &variable ) = std::string((const char *)mem);
+        *(std::string*)( &variable ) = (const char *)mem;
         mem += variable.length()+1;
     }
@@ -414 +414 @@
     template <> inline bool checkEquality( const std::string& variable, uint8_t* mem )
     {
-        return std::string((const char*)mem)==variable;
+        //return std::string((const char*)mem)==variable;
+        return (const char*)mem==variable;
     }