Changeset 1248

Timestamp:

May 8, 2008, 11:53:58 AM (16 years ago)

Author:

scheusso

Message:

some enhanced memory handling

Location:

code/branches/network3/src/network

Files:

• Client.cc (modified) (9 diffs)
• Client.h (modified) (2 diffs)
• GameStateManager.cc (modified) (1 diff)
• PacketDecoder.cc (modified) (8 diffs)
• PacketGenerator.cc (modified) (9 diffs)
• Server.cc (modified) (2 diffs)
• Synchronisable.cc (modified) (1 diff)

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

@@ -84 +84 @@
     // set server address to localhost
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -94 +94 @@
   Client::Client(std::string address, int port) : client_connection(port, address){
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -104 +104 @@
   Client::Client(const char *address, int port) : client_connection(port, address){
     isConnected=false;
-    test_once=false;
+    isSynched_=false;
   }
 
@@ -229 +229 @@
   */
   void Client::tick(float time){
-    if(client_connection.isConnected()){
+    if(client_connection.isConnected() && isSynched_){
       COUT(4) << "popping partial gamestate: " << std::endl;
       GameStateCompressed *gs = gamestate.popPartialGameState();
@@ -246 +246 @@
       packet = client_connection.getPacket();
       COUT(5) << "tick packet size " << packet->dataLength << std::endl;
-      if(!test_once){
-        elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
-      }
+      elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
     }
     if(!client_connection.sendPackets())
@@ -256 +254 @@
 
   void Client::processGamestate( GameStateCompressed *data, int clientID){
-    if(!test_once){
-      int id = data->id;
-      COUT(5) << "received gamestate id: " << data->id << std::endl;
-      if(gamestate.pushGameState(data)){
-        client_connection.addPacket(pck_gen.acknowledgement(id));
+    int id = data->id;
+    COUT(5) << "received gamestate id: " << data->id << std::endl;
+    if(gamestate.pushGameState(data)){
+      if(!isSynched_)
+        isSynched_=true;
+      client_connection.addPacket(pck_gen.acknowledgement(id));
         // we do this at the end of a tick
-//        if(!client_connection.sendPackets())
-//          COUT(2) << "Could not send acknowledgment" << std::endl;
-      }
-//       test_once=true;
+       if(!client_connection.sendPackets())
+         COUT(2) << "Could not send acknowledgment" << std::endl;
     }
   }
@@ -275 +272 @@
       id->setNetworkID(clid->clid);
     COUT(4) << "Client: received and set network id: " << clid->clid << "; classname: " << clid->message << std::endl;
+    delete clid;
     return;
   }
@@ -280 +278 @@
   void Client::processChat( chat *data){
     COUT(0) << "Server: " << data->message << std::endl;
+    delete[] data->message;
+    delete data;
   }
   
@@ -286 +286 @@
     clientID_ = w->clientID;
     shipID_ = w->shipID;
+    delete w;
     return true;
   }

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

@@ -101 +101 @@
     GameStateClient gamestate;
     bool isConnected;
+    bool isSynched_;
 
     // implement data processing functions of PacketDecoder
@@ -109 +110 @@
     int clientID_;     // this is the id the server gave to us
     int shipID_;
-    bool test_once;
   };
 

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

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

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

@@ -90 +90 @@
     return false;
   }
+  
+  // ATTENTION: TODO watch, that arguments we pass over to the processFunction gets deleted in THE PROCESSXXX function
 
   //following are the decode functions for the data of the packets
@@ -101 +103 @@
     COUT(4) << "PacketDecoder: got ack id: " << a->a << std::endl;
     processAck( a, clientId ); //debug info
-
     //clean memory
     enet_packet_destroy( packet );
@@ -121 +122 @@
     //clean memory
     enet_packet_destroy( packet );
-
     printMouse( mouseMove ); //debug info
   }
@@ -132 +132 @@
     //clean memory
     enet_packet_destroy( packet );
-
     printKey( key ); //debug info
 
@@ -232 +231 @@
   {
     printChat(data, clientId);
+    delete[] data->message;
+    delete data;
   }
 
   void PacketDecoder::processGamestate( GameStateCompressed *state, int clientID )
   {
-    COUT(5) << "PacketDecoder: processing Gamestate" << std::endl;
+    COUT(3) << "PacketDecoder-process: processing Gamestate" << std::endl;
     //printGamestate( state );
+    delete[] state->data;
+    delete state;
   }
 
@@ -243 +246 @@
   {
     printClassid(cid);
+    delete cid;
     return;
   }
@@ -249 +253 @@
   {
     printAck(data);
+    delete data;
     return;
   }
   
   bool PacketDecoder::processWelcome( welcome *w ){
+    delete w;
     return true;
   }
@@ -258 +264 @@
   bool PacketDecoder::processConnectRequest( connectRequest *con, int clientID ){
     COUT(3) << "packetdecoder: processing connectRequest" << std::endl;
+    delete con;
     return true;
   }

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

@@ -58 +58 @@
 
     ENetPacket *packet = enet_packet_create( ackreq , sizeof( *ackreq ), reliable );
-
+    delete ackreq;
     return packet;
   }
@@ -71 +71 @@
     memcpy((unsigned char *)stream+sizeof(int), (void*)&dataLength, sizeof(int));
     memcpy((unsigned char *)stream+2*sizeof(int), data, dataLength);
-    return enet_packet_create(stream, dataLength+2*sizeof(int), reliable);
+    ENetPacket *packet = enet_packet_create(stream, dataLength+2*sizeof(int), reliable);
+    delete[] stream; // TODO: we could also tell enet not to copy the data, but to use the exisiting memory
+    return packet;
   }
 
@@ -84 +86 @@
 
     ENetPacket *packet = enet_packet_create( mousemove , sizeof( *mousemove ), reliable );
-
+    delete mousemove;
     return packet;
   }
@@ -97 +99 @@
 
     ENetPacket *packet = enet_packet_create( key , sizeof( *key ), reliable );
-
+    delete key;
     return packet;
   }
@@ -109 +111 @@
     memcpy( &trans[1], (const void*)message, strlen( message ) + 1);
     ENetPacket *packet = enet_packet_create( trans , sizeof( int ) + strlen( message ) + 1, reliable );
-
+    delete[] trans;
     return packet;
   }
@@ -136 +138 @@
     COUT(4) << "PacketGenerator generating totalLen " << totalLen << std::endl;
     ENetPacket *packet = enet_packet_create( data , totalLen, reliable );
-    //delete data;
+    delete[] data;
     return packet;
   }
@@ -150 +152 @@
     memcpy( (void *)(data+3*sizeof(int)), classname.c_str(), classname.length()+1);
     ENetPacket *packet = enet_packet_create( data , 3*sizeof(int)+classname.length()+1, reliable );
+    delete[] data;
     return packet;
   }
@@ -160 +163 @@
     wc->allowed = true;
     ENetPacket *packet = enet_packet_create( wc, sizeof(welcome), reliable);
+    delete wc;
     return packet;
   }
@@ -166 +170 @@
     connectRequest *con = new connectRequest;
     con->id=CONNECT;
-    return enet_packet_create( con, sizeof(connectRequest), reliable);
+    ENetPacket *packet = enet_packet_create( con, sizeof(connectRequest), reliable);
+    delete con;
+    return packet;
   }
 

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

@@ -232 +232 @@
     //connection->addPacket(packet_gen.gstate(gamestates->popGameState(clientID)) , clientID);
     connection->createClient(clientID);
+    delete con;
     return true;
   }
@@ -239 +240 @@
     if(!gamestates->pushGameState(data, clientID))
         COUT(3) << "Could not push gamestate\t\t\t\t=====" << std::endl;
+    delete[] data->data;
+    delete data;
   }
 

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

@@ -166 +166 @@
       //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
       if( ((*i)->mode & state_) == 0 ){
-        COUT(4) << "not getting data: " << std::endl;
+        COUT(5) << "not getting data: " << std::endl;
         continue;  // this variable should only be received
       }