Changeset 1246

Timestamp:

May 7, 2008, 5:34:35 PM (16 years ago)

Author:

scheusso

Message:

fixed some memory leaks (not all though)

Location:

code/branches/network3/src/network

Files:

• Client.cc (modified) (3 diffs)
• ConnectionManager.cc (modified) (1 diff)
• GameStateClient.cc (modified) (1 diff)
• GameStateManager.cc (modified) (1 diff)
• Server.cc (modified) (3 diffs)

code/branches/network3/src/network/Client.cc

@@ -235 +235 @@
         COUT(4) << "client tick: sending gs " << gs << std::endl;
         if(client_connection.addPacket(pck_gen.gstate(gs)))
-          if(!client_connection.sendPackets())
-            COUT(3) << "Problem sending partial gamestate" << std::endl;
+          COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // now delete it to save memory
         delete [] gs->data;
@@ -251 +250 @@
       }
     }
+    if(!client_connection.sendPackets())
+      COUT(3) << "Problem sending packets to server" << std::endl;
     return;
   }
@@ -260 +261 @@
       if(gamestate.pushGameState(data)){
         client_connection.addPacket(pck_gen.acknowledgement(id));
-        if(!client_connection.sendPackets())
-          COUT(2) << "Could not send acknowledgment" << std::endl;
+        // we do this at the end of a tick
+//        if(!client_connection.sendPackets())
+//          COUT(2) << "Could not send acknowledgment" << std::endl;
       }
 //       test_once=true;

code/branches/network3/src/network/ConnectionManager.cc

@@ -199 +199 @@
           break;
       }
-//       usleep(1000);
+      usleep(100);
       //yield(); //TODO: find apropriate
     }

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

@@ -289 +289 @@
 
     switch ( retval ) {
-      case Z_OK: COUT(5) << "G.St.Man: compress: successfully compressed" << std::endl; break;
-      case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl; 
-      return NULL;
-      case Z_BUF_ERROR: COUT(2) << "G.St.Man: compress: not enough memory available in the buffer in gamestate.compress" << std::endl;
-      return NULL;
-      case Z_DATA_ERROR: COUT(2) << "G.St.Man: compress: data corrupted in gamestate.compress" << std::endl;
+      case Z_OK: COUT(5) << "G.St.Cl: compress: successfully compressed" << std::endl; break;
+      case Z_MEM_ERROR: COUT(1) << "G.St.Cl: compress: not enough memory available in gamestate.compress" << std::endl; 
+      return NULL;
+      case Z_BUF_ERROR: COUT(2) << "G.St.Cl: compress: not enough memory available in the buffer in gamestate.compress" << std::endl;
+      return NULL;
+      case Z_DATA_ERROR: COUT(2) << "G.St.Cl: compress: data corrupted in gamestate.compress" << std::endl;
       return NULL;
     }

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

@@ -260 +260 @@
       ++it;
     }
-
+    
+    delete[] state->data;
+    delete state;
     return true;
   }

code/branches/network3/src/network/Server.cc

@@ -210 +210 @@
       added=true;
       temp=temp->next();
+      // now delete gamestate
+      delete[] gs->data;
+      delete gs;
     }
     if(added) {
@@ -222 +225 @@
     COUT(4) << "Server: processing ack from client: " << clientID << "; ack-id: " << data->a << std::endl;
     gamestates->ackGameState(clientID, data->a);
+    delete data;
   }
   
@@ -235 +239 @@
     if(!gamestates->pushGameState(data, clientID))
         COUT(3) << "Could not push gamestate\t\t\t\t=====" << std::endl;
-//     delete[] data->data;
-//     delete data;
   }