Changeset 2660 for code/branches/presentation/src/network

Timestamp:

Feb 14, 2009, 6:01:05 PM (16 years ago)

Author:

scheusso

Message:

fixed a problem with gamestate caching and diffing

Location:

code/branches/presentation/src/network

Files:

• GamestateClient.cc (modified) (5 diffs)
• GamestateManager.cc (modified) (2 diffs)
• packet/Acknowledgement.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (2 diffs)
• packet/Gamestate.h (modified) (2 diffs)

code/branches/presentation/src/network/GamestateClient.cc

@@ -75 +75 @@
     if(tempGamestate_==NULL)
       return false;
+    bool isDiffed = tempGamestate_->isDiffed();
     int id = GAMESTATEID_INITIAL;
     packet::Gamestate *processed = processGamestate(tempGamestate_);
@@ -83 +84 @@
     
     if (!processed){
-//      sendAck(0);
+      sendAck(0);
       return false;
     }
@@ -89 +90 @@
     tempGamestate_=NULL;
     gamestateMap_[processed->getID()]=processed;
-    last_diff_ = processed->getID();
+    if(isDiffed)
+      last_diff_ = processed->getBaseID();
     id = processed->getID();
-//     sendAck(id);
+    sendAck(id);
     return true;
   }
@@ -160 +162 @@
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
       if(!base){
-COUT(0) << "could not find base gamestate id: " << gs->getBaseID() << endl;
+        COUT(3) << "could not find base gamestate id: " << gs->getBaseID() << endl;
         delete gs;
         return 0;
@@ -173 +175 @@
       return gs;
     else
-COUT(0) << "could not spread gamestate" << endl;
+    {
+      COUT(3) << "could not spread gamestate" << endl;
       return NULL;
+    }
   }
 

code/branches/presentation/src/network/GamestateManager.cc

@@ -113 +113 @@
     //why are we searching the same client's gamestate id as we searched in
     //Server::sendGameState?
-    packet::Gamestate *gs;
+    packet::Gamestate *gs, *temp;
     unsigned int gID = ClientInformation::findClient(clientID)->getGamestateID();
     if(!reference)
       return 0;
     gs = reference->doSelection(clientID, 10000);
+    temp = gs;
 //     gs = new packet::Gamestate(*reference);
     // save the (undiffed) gamestate in the clients gamestate map
@@ -142 +143 @@
     bool b = gs->compressData();
     assert(b);
+    COUT(4) << "sending gamestate with id " << gs->getID();
+    if(gs->isDiffed())
+    COUT(4) << " and baseid " << gs->getBaseID() << endl;
+    else
+    COUT(4) << endl;
     return gs;
   }

code/branches/presentation/src/network/packet/Acknowledgement.cc

@@ -64 +64 @@
 
 bool Acknowledgement::process(){
+COUT(0) << "processing ACK with ID: " << getAckID() << endl;
   bool b = GamestateHandler::ackGamestate(getAckID(), clientID_);
   delete this;

code/branches/presentation/src/network/packet/Gamestate.cc

@@ -70 +70 @@
   flags_ = flags_ | PACKET_FLAG_GAMESTATE;
   data_=data;
+  header_ = new GamestateHeader(data_);
+}
+
+Gamestate::Gamestate(const Gamestate& g) :
+    Packet( *(Packet*)&g )
+{
+  flags_ = flags_ | PACKET_FLAG_GAMESTATE;
   header_ = new GamestateHeader(data_);
 }
@@ -146 +153 @@
 bool Gamestate::spreadData(uint8_t mode)
 {
+  COUT(4) << "processing gamestate with id " << header_->getID() << endl;
   assert(data_);
   assert(!header_->isCompressed());

code/branches/presentation/src/network/packet/Gamestate.h

@@ -48 +48 @@
 class _NetworkExport GamestateHeader{
   public:
-    GamestateHeader(uint8_t *data){ data_ = data; *(uint32_t*)data_ = ENUM::Gamestate; }
+    GamestateHeader(uint8_t *data){ assert(data); data_ = data; *(uint32_t*)data_ = ENUM::Gamestate; }
     GamestateHeader(uint8_t *data, GamestateHeader* h)
-      { data_=data; memcpy(data_, h->data_, getSize()); }
+    { assert(data); data_=data; memcpy(data_, h->data_, getSize()); }
     static inline uint32_t getSize()
-      { return 21; }
+    { return 21; }
 
     inline int32_t getID() const
-      { return *(int32_t*)(data_+4); }
+    { assert(data_); return *(int32_t*)(data_+4); }
     inline void setID(int32_t id)
-      { *(int32_t*)(data_+4) = id; }
+    { assert(data_); *(int32_t*)(data_+4) = id; }
 
     inline int32_t getBaseID() const
-      { return *(int32_t*)(data_+8); }
+    { assert(data_); return *(int32_t*)(data_+8); }
     inline void setBaseID(int32_t id)
-      { *(int32_t*)(data_+8) = id; }
+    { assert(data_); *(int32_t*)(data_+8) = id; }
 
     inline uint32_t getDataSize() const
-      { return *(uint32_t*)(data_+12); }
+    { assert(data_); return *(uint32_t*)(data_+12); }
     inline void setDataSize(uint32_t size)
-      { *(uint32_t*)(data_+12) = size; }
+    { assert(data_); *(uint32_t*)(data_+12) = size; }
 
     inline uint32_t getCompSize() const
-      { return *(uint32_t*)(data_+16); }
+    { assert(data_); return *(uint32_t*)(data_+16); }
     inline void setCompSize(uint32_t size)
-      { *(uint32_t*)(data_+16) = size; }
+    { assert(data_); *(uint32_t*)(data_+16) = size; }
 
     inline bool isDiffed() const
-      { return *(int8_t*)(data_+20) & 0x1; }
+    { assert(data_); return *(int8_t*)(data_+20) & 0x1; }
     inline void setDiffed(bool b)
-      { *(int8_t*)(data_+20) = (b<<0) | (*(int8_t*)(data_+20) & 0x6 ); }
+    { assert(data_); *(int8_t*)(data_+20) = (b<<0) | (*(int8_t*)(data_+20) & 0x6 ); }
 
     inline bool isComplete() const
-      { return *(int8_t*)(data_+20) & 0x2; }
+    { assert(data_); return *(int8_t*)(data_+20) & 0x2; }
     inline void setComplete(bool b)
-      { *(int8_t*)(data_+20) = (b<<1) | (*(int8_t*)(data_+20) & 0x5 ); }
+    { assert(data_); *(int8_t*)(data_+20) = (b<<1) | (*(int8_t*)(data_+20) & 0x5 ); }
 
     inline bool isCompressed() const
-      { return *(int8_t*)(data_+20) & 0x4; }
+    { assert(data_); return *(int8_t*)(data_+20) & 0x4; }
     inline void setCompressed(bool b)
-      { *(int8_t*)(data_+20) = (b<<2) | (*(int8_t*)(data_+20) & 0x3 ); }
+    { assert(data_); *(int8_t*)(data_+20) = (b<<2) | (*(int8_t*)(data_+20) & 0x3 ); }
 
     inline void operator=(GamestateHeader& h)
-      { memcpy( data_, h.data_, getSize()); }
+    { assert(data_); assert(h.data_); memcpy( data_, h.data_, getSize()); }
   private:
     uint8_t *data_;
@@ -107 +107 @@
     Gamestate(uint8_t *data, unsigned int clientID);
     Gamestate(uint8_t *data);
+    Gamestate(const Gamestate& g);
 
     ~Gamestate();