Changeset 1005 for code/branches/network/src/network/GameStateClient.cc

Timestamp:

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

Author:

scheusso

Message:

enhanced memory management in gamestatemanager and gamestateclient

File:

• code/branches/network/src/network/GameStateClient.cc (modified) (4 diffs)

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