Changeset 1574 for code/branches/core3/src/network

Timestamp:

Jun 9, 2008, 4:35:38 AM (16 years ago)

Author:

landauf

Message:

big change in ObjectList: separated the class into a non-template base and a template wrapper for the base. this also changes the Iterator, there is now a non-template IteratorBase. this brings much more flexibility, like iterating through all objects of a given identifier without knowing the type. however this needs a dynamic_cast, which isn't quite optimal, but I think there are much worser things than that out there.

there isn't much you have to know about this, except there is no more ObjectList<myClass>::start() function but a ObjectList<myClass>::begin() to be more STLish. another thing: ObjectList<myClass>::end() points now to the element _after_ the last element, so it's possible to iterate in a for-loop until (it != ObjectList<myClass>::end()). the reason is the same as above. however, (it) as a boolean still works perfectly fine.

Location:

code/branches/core3/src/network

Files:

• ConnectionManager.cc (modified) (9 diffs)
• GameStateClient.cc (modified) (3 diffs)
• GameStateManager.cc (modified) (15 diffs)
• Server.cc (modified) (13 diffs)

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

@@ -64 +64 @@
 {
   //boost::thread_group network_threads;
-  
+
   ConnectionManager::ConnectionManager():receiverThread_(0){}
   boost::recursive_mutex ConnectionManager::enet_mutex_;
-  
+
   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
     quit=false;
@@ -74 +74 @@
     head_ = head;
   }
-  
+
   ConnectionManager::ConnectionManager(ClientInformation *head, int port){
     quit=false;
@@ -115 +115 @@
     return packet;
   }*/
-  
+
   ENetEvent *ConnectionManager::getEvent(){
     if(!buffer.isEmpty())
@@ -251 +251 @@
     }
   }
-  
+
   //### added some bugfixes here, but we cannot test them because
   //### the server crashes everytime because of some gamestates
@@ -333 +333 @@
   }
 
-  
-  
+
+
   bool ConnectionManager::removeShip(ClientInformation *client){
     int id=client->getShipID();
     orxonox::Iterator<orxonox::SpaceShip> it;
-    for(it = orxonox::ObjectList<orxonox::SpaceShip>::start(); it; ++it){
+    for(it = orxonox::ObjectList<orxonox::SpaceShip>::begin(); it; ++it){
       if(it->objectID!=id)
         continue;
@@ -345 +345 @@
     return true;
   }
-  
+
   bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
     if(addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID)){
@@ -353 +353 @@
       return false;
   }
-  
+
   void ConnectionManager::disconnectClient(ClientInformation *client){
     {
@@ -362 +362 @@
     removeShip(client);
   }
-  
+
   bool ConnectionManager::addFakeConnectRequest(ENetEvent *ev){
     ENetEvent event;
@@ -369 +369 @@
     return buffer.push(&event);
   }
-  
-  
+
+
 
 }

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

@@ -151 +151 @@
     COUT(4) << "loadSnapshot: loading gs: " << state->id << std::endl;
     // get the start of the Synchronisable list
-    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
+    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::begin();
     syncData sync;
     // loop as long as we have some data ;)
@@ -236 +236 @@
     int offset=0, size=0;
     // get total size of gamestate
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       if(!it->getBacksync())
         continue;
@@ -253 +253 @@
     memsize=size;
     // go through all Synchronisables
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       if(!it->getBacksync())
         continue;

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

@@ -70 +70 @@
     return;
   }
-  
+
   void GameStateManager::addGameState(GameStateCompressed *gs, int clientID){
     if(!gs)
@@ -83 +83 @@
     return;
   }
-  
+
   void GameStateManager::processGameStates(){
     std::map<int, GameStateCompressed*>::iterator it;
@@ -93 +93 @@
     gameStateQueue.clear();
   }
-  
-  
+
+
   /**
    * this function is used to keep the memory usage low
    * it tries to delete all the unused gamestates
-   * 
-   * 
+   *
+   *
    */
   void GameStateManager::cleanup(){
@@ -155 +155 @@
     }
   }
-  
+
   bool GameStateManager::pushGameState( GameStateCompressed *gs, int clientID ){
     GameState *ugs = decompress(gs);
@@ -190 +190 @@
     int offset=0, size=0;
     // get total size of gamestate
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       size+=it->getSize(); // size of the actual data of the synchronisable
       size+=3*sizeof(int); // size of datasize, classID and objectID
@@ -204 +204 @@
     memsize=size;
     // go through all Synchronisables
-    for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+    for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
       //get size of the synchronisable
       tempsize=it->getSize();
@@ -246 +246 @@
     COUT(4) << "loadSnapshot: loading gs: " << state->id << std::endl;
     // get the start of the Synchronisable list
-    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
+    orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::begin();
     syncData sync;
     /*ClientInformation *client = head_->findClient(clientID);
@@ -308 +308 @@
     return true;
   }
-  
-  
+
+
   //##### ADDED FOR TESTING PURPOSE #####
   GameStateCompressed* GameStateManager::testCompress( GameState* g ) {
@@ -405 +405 @@
     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; 
+      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;
@@ -426 +426 @@
     return compressedGamestate;
   }
-  
+
   GameState *GameStateManager::decompress(GameStateCompressed *a) {
     //COUT(4) << "GameStateClient: uncompressing gamestate. id: " << a->id << ", baseid: " << a->base_id << ", normsize: " << a->normsize << ", compsize: " << a->compsize << std::endl;
@@ -464 +464 @@
     return gamestate;
   }
-  
+
 
   void GameStateManager::ackGameState(int clientID, int gamestateID) {
@@ -471 +471 @@
       return;
     int curid = temp->getGamestateID();
-    
+
     if(gamestateID == GAMESTATEID_INITIAL){
       temp->setGameStateID(GAMESTATEID_INITIAL);
@@ -481 +481 @@
     }
     if(curid > gamestateID)
-      // the network packets got messed up 
+      // the network packets got messed up
       return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
@@ -512 +512 @@
     return true;
   }
-  
+
   bool GameStateManager::checkAccess(int clientID, int objectID){
     // currently we only check, wheter the object is the clients spaceship
@@ -518 +518 @@
     return true; // TODO: change this
   }
-  
+
   void GameStateManager::removeClient(ClientInformation* client){
     if(!client)

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

@@ -57 +57 @@
   #define MAX_FAILURES 20;
   #define NETWORK_FREQUENCY 30
-  
+
   Server *Server::instance_=0;
-  
+
   Server *Server::createSingleton(){
     if(!instance_)
@@ -80 +80 @@
     return instance_;
   }
-  
+
   Server *Server::getSingleton(){
     return instance_;
   }
-  
-  
+
+
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -97 +97 @@
     gamestates = new GameStateManager(clients);
   }
-  
+
   Server::Server(int port){
     timeSinceLastUpdate_=0;
@@ -217 +217 @@
         if(clients->findClient(&event->peer->address)){
           clientID = clients->findClient(&event->peer->address)->getID();
-          if( !elaborate(event->packet, clientID) ) 
+          if( !elaborate(event->packet, clientID) )
             COUT(3) << "Server: could not elaborate" << std::endl;
         }
@@ -276 +276 @@
         continue;
       if ( !(connection->addPacket(packet, cid)) ){
-        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
+        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl;
         temp->addFailure();
         /*if(temp->getFailures() > 0 )
@@ -302 +302 @@
     delete data;
   }
-  
+
   bool Server::processConnectRequest( connectRequest *con, int clientID ){
     //(COUT(3) << "processing connectRequest " << std::endl;
@@ -310 +310 @@
     return true;
   }
-  
+
   void Server::processGamestate( GameStateCompressed *data, int clientID){
     COUT(4) << "processing partial gamestate from client " << clientID << std::endl;
@@ -319 +319 @@
         clients->findClient(clientID)->resetFailures();*/
   }
-  
+
   void Server::processChat( chat *data, int clientId){
     char *message = new char [strlen(data->message)+10+1];
@@ -329 +329 @@
     delete data;
   }
-  
+
   bool Server::addClient(ENetEvent *event){
     ClientInformation *temp = clients->insertBack(new ClientInformation);
@@ -346 +346 @@
     return createClient(temp->getID());
   }
-  
+
   bool Server::createClient(int clientID){
     ClientInformation *temp = clients->findClient(clientID);
@@ -366 +366 @@
     return true;
   }
-  
+
   bool Server::createShip(ClientInformation *client){
     if(!client)
@@ -390 +390 @@
     no->classID = id->getNetworkID();
     no->create();
-    
+
     client->setShipID(no->objectID);
     return true;
   }
-  
+
   bool Server::disconnectClient(ENetEvent *event){
     COUT(4) << "removing client from list" << std::endl;
     //return removeClient(head_->findClient(&(peer->address))->getID());
-    
+
     //boost::recursive_mutex::scoped_lock lock(head_->mutex_);
-    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
+    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::begin();
     ClientInformation *client = clients->findClient(&event->peer->address);
     if(!client)
@@ -426 +426 @@
     gamestates->removeClient(client);
   }
-  
+
 }