Changeset 2417

Timestamp:

Dec 12, 2008, 10:56:22 AM (16 years ago)

Author:

scheusso

Message:

further improvements in diffing (around 50% reduction of traffic)

Location:

code/branches/presentation/src/network

Files:

• packet/Gamestate.cc (modified) (3 diffs)
• synchronisable/Synchronisable.cc (modified) (1 diff)

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

@@ -151 +151 @@
     if(!s)
     {
-      s = Synchronisable::fabricate(mem, mode);
-      if(s==0)
-        assert(0);
+      Synchronisable::fabricate(mem, mode);
 //         COUT(0) << "could not fabricate synchronisable: " << objectheader->objectID << " classid: " << objectheader->classID << " creator: " << objectheader->creatorID << endl;
 //       else
@@ -349 +347 @@
   Gamestate *gs = new Gamestate(gdata);
   uint8_t *newdata = gdata + sizeof(GamestateHeader);
-//   uint8_t *origdata = GAMESTATE_START(data_);
+  uint8_t *origdata = GAMESTATE_START(data_);
 
   //copy the GamestateHeader
@@ -364 +362 @@
   //copy in the zeros
   for(it=dataMap_.begin(); it!=dataMap_.end(); it++){
-    oldobjectheader = (synchronisableHeader*)(data_ + (*it).objDataOffset);
+    oldobjectheader = (synchronisableHeader*)origdata;
     newobjectheader = (synchronisableHeader*)newdata;
-    object = Synchronisable::getSynchronisable( (*it).objID );
-    assert(object->objectID == oldobjectheader->objectID);
+//     object = Synchronisable::getSynchronisable( (*it).objID );
+//     assert(object->objectID == oldobjectheader->objectID);
     objectsize = oldobjectheader->size;
-    *newobjectheader = *oldobjectheader;
     objectOffset=sizeof(synchronisableHeader); //skip the size and the availableData variables in the objectheader
-    if ( /*object->doSelection(HEADER->id)*/true ){
+    if ( (*it).objID == oldobjectheader->objectID ){
+      memcpy(newdata, origdata, objectsize);
       assert(newobjectheader->dataAvailable==true);
-      memcpy(newdata+objectOffset, data_ + (*it).objDataOffset + objectOffset, objectsize-objectOffset);
     }else{
+      *newobjectheader = *oldobjectheader;
       newobjectheader->dataAvailable=false;
       memset(newdata+objectOffset, 0, objectsize-objectOffset);
-      assert(objectOffset==objectsize);
     }
     newdata += objectsize;
+    origdata += objectsize;
     destsize += objectsize;
 //     origdata += objectsize;

code/branches/presentation/src/network/synchronisable/Synchronisable.cc

@@ -170 +170 @@
       {
         mem += header->size; //.TODO: this suckz.... remove size from header
+        assert(0);
         return 0;
       }