Changeset 1005 for code/branches

Timestamp:

Apr 9, 2008, 8:38:52 PM (17 years ago)

Author:

scheusso

Message:

enhanced memory management in gamestatemanager and gamestateclient

Location:

code/branches/network/src/network

Files:

• GameStateClient.cc (modified) (4 diffs)
• GameStateClient.h (modified) (2 diffs)
• GameStateManager.cc (modified) (1 diff)
• GameStateManager.h (modified) (1 diff)

code/branches/network/src/network/GameStateClient.cc

@@ -33 +33 @@
 namespace network
 {
+  struct GameStateItem{
+    GameState *state;
+    int id;
+  };
+  
   GameStateClient::GameStateClient() {
   }
@@ -41 +46 @@
   bool GameStateClient::pushGameState(GameStateCompressed *compstate) {
     GameState *gs;
-    if(compstate->diffed)
-      gs = decode(reference, compstate);
+    if(compstate->diffed){
+      while(compstate->base_id > gameStateList.front()->id){
+        // clean up old gamestates
+        free(gameStateList.front()->data);
+        // TODO: critical section
+        delete gameStateList.front();
+        gameStateList.pop();
+      }
+      if(compstate->base_id!=gameStateList.front()->id){
+        COUT(4) << "pushGameState: no reference found to diff" << std::endl;
+        return false;
+      }
+      gs = decode(gameStateList.front(), compstate);
+    }
     else
       gs = decode(compstate);
@@ -197 +214 @@
   GameState *GameStateClient::decode(GameState *a, GameStateCompressed *x) {
     GameState *t = decompress(x);
+    gameStateList.push(t);
     return undiff(a, t);
   }
@@ -202 +220 @@
   GameState *GameStateClient::decode(GameStateCompressed *x) {
     GameState *t = decompress(x);
+    gameStateList.push(t);
     return t;
   }

code/branches/network/src/network/GameStateClient.h

@@ -13 +13 @@
 #define _GameStateClient_H__
 
+#include <queue>
+
 #include "NetworkPrereqs.h"
-#include "GameStateManager.h"
+#include "PacketTypes.h"
 
 namespace network
@@ -36 +38 @@
     void removeObject(orxonox::Iterator<Synchronisable> &it);
 
-    GameState *reference;
+    GameState     *reference;
+    std::queue<GameState *> gameStateList;
   };
 

code/branches/network/src/network/GameStateManager.cc

@@ -64 +64 @@
     ++id;
     return;
+  }
+  
+  void GameStateManager::cleanup(){
+    /*unsigned int min_id=-1;
+    int temp_id=0;
+    ClientInformation *temp = head_;
+    while(temp){
+      if(temp->head)
+        continue;
+      temp_id=temp->getID();
+      if(temp_id<min_id)
+        min_id=temp_id;
+      temp=temp->next();
+    }*/ // probably not very efficient
+    
+    std::map<int,int>::iterator it = gameStateUsed.begin();
+    while(it!=gameStateUsed.end()){
+      if( (*it).second <= 0 ){
+        free(gameStateMap[(*it).first]->data);
+        delete gameStateMap[(*it).first];
+        gameStateMap.erase((*it).first);
+        gameStateUsed.erase(it++);
+      }else
+        it++;
+    }
   }
 

code/branches/network/src/network/GameStateManager.h

@@ -47 +47 @@
     //#### END TESTING PURPOSE ####
     void update();
+    void cleanup(); // "garbage handler"
     GameStateCompressed *popGameState(int clientID);
     void ackGameState(int clientID, int gamestateID);