Changeset 2832

Timestamp:

Mar 23, 2009, 2:53:10 PM (16 years ago)

Author:

scheusso

Message:

further improvements in network (eliminated double calls of Synchronisable::getSize)

Location:

code/branches/netp/src/network

Files:

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

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

@@ -107 +107 @@
   for(it = ObjectList<Synchronisable>::begin(); it; ++it){
     
-    tempsize=it->getSize(id, mode);
+//     tempsize=it->getSize(id, mode);
+
+    tempsize = it->getData(mem, id, mode);
+    if ( it->doSync( id, mode ) )
+      dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
+    
 #ifndef NDEBUG
     if(currentsize+tempsize > size){
@@ -123 +128 @@
     }// stop allocate additional memory
 #endif
-
-    if ( it->doSync( id, mode ) )
-      dataMap_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
-    if(!it->getData(mem, id, mode))
-      return false; // mem pointer gets automatically increased because of call by reference
+//     if(!it->getData(mem, id, mode))
+//       return false; // mem pointer gets automatically increased because of call by reference
     // increase size counter by size of current synchronisable
     currentsize+=tempsize;

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

@@ -238 +238 @@
    * @return true: if !doSync or if everything was successfully saved
    */
-  bool Synchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){
+  uint32_t Synchronisable::getData(uint8_t*& mem, int32_t id, uint8_t mode){
     if(mode==0x0)
       mode=state_;
     //if this tick is we dont synchronise, then abort now
     if(!doSync(id, mode))
-      return true;
+      return 0;
     uint32_t tempsize = 0;
     if (this->classID==0)
@@ -279 +279 @@
     assert(tempsize==size);
 #endif
-    return true;
+    return tempsize;
   }
 

code/branches/netp/src/network/synchronisable/Synchronisable.h

@@ -147 +147 @@
 
   private:
-    bool getData(uint8_t*& men, int32_t id, uint8_t mode=0x0);
+    uint32_t getData(uint8_t*& men, int32_t id, uint8_t mode=0x0);
     uint32_t getSize(int32_t id, uint8_t mode=0x0);
     bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);