Changeset 1355

Timestamp:

May 22, 2008, 11:53:19 AM (16 years ago)

Author:

scheusso

Message:

some enhanced enet usage (gamestates are not reliable anymore - we hope to get a latency reduction)

Location:

code/branches/merge/src

Files:

• network/ClientInformation.cc (modified) (4 diffs)
• network/ClientInformation.h (modified) (3 diffs)
• network/ConnectionManager.cc (modified) (2 diffs)
• network/GameStateClient.cc (modified) (4 diffs)
• network/GameStateClient.h (modified) (1 diff)
• network/GameStateManager.cc (modified) (3 diffs)
• network/PacketManager.h (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (1 diff)

code/branches/merge/src/network/ClientInformation.cc

@@ -51 +51 @@
     preve=0;
     nexte=0;
+    partialGamestateID_=GAMESTATEID_INITIAL-1;
     this->head_=false;
     synched_=false;
@@ -59 +60 @@
     preve=0;
     nexte=0;
+    partialGamestateID_=GAMESTATEID_INITIAL-1;
     this->head_=head;
     synched_=false;
@@ -159 +161 @@
     return true;
   }
+  
+  bool ClientInformation::setPartialGamestateID(int id){
+    boost::recursive_mutex::scoped_lock lock(mutex_);
+    if(!this)
+      return false;
+    partialGamestateID_=id;
+    return true;
+  }
 
   int ClientInformation::getID() {
@@ -203 +213 @@
     if(this)
       return gamestateID_;
+    else
+      return -1;
+  }
+  
+  int ClientInformation::getPartialGamestateID() {
+    boost::recursive_mutex::scoped_lock lock(mutex_);
+    if(this)
+      return partialGamestateID_;
     else
       return -1;

code/branches/merge/src/network/ClientInformation.h

@@ -70 +70 @@
     bool setPeer(ENetPeer *peer);
     bool setGamestateID(int id);
+    bool setPartialGamestateID(int id);
     inline void setShipID(int id){ShipID_=id;}
     
@@ -76 +77 @@
     int getID();
     int getGamestateID();
+    int getPartialGamestateID();
     ENetPeer *getPeer();
     bool getHead();
@@ -107 +109 @@
     int clientID_;
     int gamestateID_;
+    int partialGamestateID_;
     int ShipID_;   // this is the unique objectID
     bool synched_;

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

@@ -193 +193 @@
           addClient(event);
           //this is a workaround to ensure thread safety
-          /*if(!addFakeConnectRequest(&event))
-            COUT(3) << "Problem pushing fakeconnectRequest to queue" << std::endl;*/
           COUT(5) << "Con.Man: connection event has occured" << std::endl;
           break;
@@ -210 +208 @@
           break;
         case ENET_EVENT_TYPE_NONE:
+          receiverThread_->yield();
           break;
       }

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

@@ -47 +47 @@
     COUT(5) << "this: " << this << std::endl;
     last_diff_=0;
+    last_gamestate_=GAMESTATEID_INITIAL-1;
   }
 
@@ -56 +57 @@
     printGameStateMap();
     GameState *gs, *reference;
+    /*if(compstate->id<last_gamestate_){
+      // network packets got messed up
+      COUT(3) << "received an obsolete gamestate" << std::endl;
+      return false;
+    }*/
     if(compstate->diffed && compstate->base_id!=GAMESTATEID_INITIAL){
       std::map<int, GameState*>::iterator it = gameStateMap.find(compstate->base_id);
@@ -77 +83 @@
         COUT(4) << "adding decoded gs with id: " << gs->id << " diffed from: " << gs->base_id << std::endl;
         last_diff_=gs->base_id;
+        //last_gamestate_=gs->id;
         return true;
       }else{
@@ -149 +156 @@
           Synchronisable *no = dynamic_cast<Synchronisable *>(id->fabricate());
           COUT(4) << "loadsnapshot: classid: " << sync.classID << " objectID: " << sync.objectID << " length: " << sync.length << std::endl;
+          if(!no){
+            COUT(2) << "coudl not frabricate classid: " << sync.classID << " objectID: " << sync.objectID << " identifier: " << id << std::endl;
+            break;
+          }
           no->objectID=sync.objectID;
           no->classID=sync.classID;

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

@@ -71 +71 @@
 
     int           last_diff_;
+    int           last_gamestate_;
     std::map<int, GameState *> gameStateMap;
     

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

@@ -221 +221 @@
     orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
     syncData sync;
+    /*ClientInformation *client = head_->findClient(clientID);
+    if(client)
+      if(client->getPartialGamestateID()>state->id){
+        COUT(3) << "we received an obsolete partial gamestate" << std::endl;
+        return false;
+      }
+    else;*/
+        //what should we do now ??
     // loop as long as we have some data ;)
     while(data < state->data+state->size){
@@ -268 +276 @@
       ++it;
     }
-    
+    //client->setPartialGamestateID(state->id);
     return true;
   }
@@ -428 +436 @@
       return;
     int curid = temp->getGamestateID();
+    if(curid > gamestateID)
+      // the network packets got messed up 
+      return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
     // decrease usage of gamestate and save it

code/branches/merge/src/network/PacketManager.h

@@ -58 +58 @@
     PacketGenerator();
     //call one of this functions out of an instance of PacketGenerator to create a packet
-    ENetPacket* acknowledgement( int state, int reliable = ENET_PACKET_FLAG_RELIABLE );
+    ENetPacket* acknowledgement( int state, int reliable = 0 ); // we do not want reliability
     ENetPacket* command( int dataLength, void *data, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* mousem( double x, double y, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* keystrike( char press, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
-    ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+    ENetPacket* gstate( GameStateCompressed *states, int reliable = 0 ); // we do not want reliability of gamestates
     ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* generateWelcome( int clientID,int shipID, bool allowed, int reliable = ENET_PACKET_FLAG_RELIABLE );

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

@@ -156 +156 @@
     if(classID==0)
       COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
-    classID=this->getIdentifier()->getNetworkID();
+    this->classID=this->getIdentifier()->getNetworkID();
     std::list<synchronisableVariable *>::iterator i;
     syncData retVal;

code/branches/merge/src/orxonox/objects/WorldEntity.cc

@@ -152 +152 @@
       //register staticity
       registerVar( (void*) &(this->bStatic_), sizeof(this->bStatic_), network::DATA, 0x3);
-      //register acceleration
+      //register acceleration & momentum
       registerVar( (void*) &(this->getAcceleration().x), sizeof(this->getAcceleration().x), network::DATA, 0x3);
       registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x3);
       registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x3);
+      registerVar( (void*) &(this->getMomentum()), sizeof(this->getMomentum()), network::DATA);
     }