Changeset 8301 in orxonox.OLD

Timestamp:

Jun 9, 2006, 7:12:08 PM (18 years ago)

Author:

rennerc

Message:

fixed master memory leak

Location:

branches/network/src/lib/network

Files:

• connection_monitor.h (modified) (1 diff)
• network_game_manager.cc (modified) (1 diff)
• player_stats.cc (modified) (1 diff)
• player_stats.h (modified) (1 diff)
• synchronizeable.cc (modified) (9 diffs)

branches/network/src/lib/network/connection_monitor.h

@@ -14 +14 @@
 #define N_PACKETS_FOR_PING 20
 #define MSECS_TO_CALC_BWIDTH 1000
-#define SECS_TO_TIMEOUT 10
+#define SECS_TO_TIMEOUT 30
 
 class ConnectionMonitor : virtual public BaseObject

branches/network/src/lib/network/network_game_manager.cc

@@ -71 +71 @@
 {
   delete MessageManager::getInstance();
+  
+  PlayerStats::deleteAllPlayerStats();
 }
 

branches/network/src/lib/network/player_stats.cc

@@ -228 +228 @@
 
 
+
+void PlayerStats::deleteAllPlayerStats( )
+{
+  const std::list<BaseObject*> * list;
+  
+  while ( (list  = ClassList::getList( CL_PLAYER_STATS )) != NULL && list->begin() != list->end() )
+    delete *list->begin();
+}
+

branches/network/src/lib/network/player_stats.h

@@ -60 +60 @@
     static bool changeNickHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
     void shellNick( const std::string&  newNick );
+    
+    static void deleteAllPlayerStats();
 
   private:

branches/network/src/lib/network/synchronizeable.cc

@@ -83 +83 @@
     for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
     {
-      delete [] (*it2)->data;
+      if ( (*it2)->data )
+      {
+        delete [] (*it2)->data;
+        (*it2)->data = NULL;
+      }
       delete *it2;
     }
@@ -93 +97 @@
     for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
     {
-      delete [] (*it2)->data;
+      if ( (*it2)->data )
+      {
+        delete [] (*it2)->data;
+        (*it2)->data = NULL;
+      }
       delete *it2;
     }
@@ -160 +168 @@
         (*it2)->data = NULL;
       }
+      
+      delete *it2;
     }
     sentStates[userId].erase( sentStates[userId].begin(), it );
@@ -191 +201 @@
     stateFrom = (*it);
 
-  StateHistoryEntry * stateTo = new StateHistoryEntry();
-
+  StateHistoryEntry * stateTo = new StateHistoryEntry;
+
+  sentStates[userId].push_back( stateTo );
+  
   stateTo->stateId = stateId;
   stateTo->dataLength = neededSize;
@@ -241 +253 @@
   }
 
-  sentStates[userId].push_back( stateTo );
-  
   if ( i != neededSize )
   {
@@ -407 +417 @@
     {
       if ( (*it)->data )
+      {
         delete [] (*it)->data;
-      (*it)->data = NULL;
+        (*it)->data = NULL;
+      }
     
       delete *it;
@@ -421 +433 @@
     {
       if ( (*it)->data )
+      {
         delete [] (*it)->data;
-      (*it)->data = NULL;
+        (*it)->data = NULL;
+      }
     
       delete *it;
@@ -471 +485 @@
       
       if ( (*delIt)->data )
+      {
         delete [] (*delIt)->data;
+        (*delIt)->data = NULL;
+      }
       delete *delIt;
       recvStates[userId].erase( delIt );
@@ -540 +557 @@
       
       if ( (*delIt)->data )
+      {
         delete [] (*delIt)->data;
+        (*delIt)->data = NULL;
+      }
       delete *delIt;
       sentStates[userId].erase( delIt );