Changeset 2823

Timestamp:

Mar 23, 2009, 11:12:14 AM (16 years ago)

Author:

rgrieder

Message:

Further optimisations by using std::vector instead of std::list for the sync lists.

Location:

code/branches/netp/src/network/synchronisable

Files:

• Synchronisable.cc (modified) (4 diffs)
• Synchronisable.h (modified) (3 diffs)

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

@@ -98 +98 @@
     // delete callback function objects
     if(!Identifier::isCreatingHierarchy()){
-      for(std::list<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
+      for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
         delete (*it);
       if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer()))
@@ -252 +252 @@
 
     assert(this->classID==this->getIdentifier()->getNetworkID());
-    std::list<SynchronisableVariableBase*>::iterator i;
+    std::vector<SynchronisableVariableBase*>::iterator i;
 
     // start copy header
@@ -292 +292 @@
     if(mode==0x0)
       mode=state_;
-    std::list<SynchronisableVariableBase *>::iterator i;
+    std::vector<SynchronisableVariableBase *>::iterator i;
     if(syncList.empty()){
       assert(0);
@@ -337 +337 @@
     assert( mode==state_ );
     tsize += this->dataSize_;
-    std::list<SynchronisableVariableBase*>::iterator i;
+    std::vector<SynchronisableVariableBase*>::iterator i;
     for(i=stringList.begin(); i!=stringList.end(); ++i){
       tsize += (*i)->getSize( mode );

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

@@ -33 +33 @@
 
 #include <list>
+#include <vector>
 #include <map>
 #include <queue>
@@ -156 +157 @@
     uint32_t classID;
 
-    std::list<SynchronisableVariableBase*> syncList;
-    std::list<SynchronisableVariableBase*> stringList;
+    std::vector<SynchronisableVariableBase*> syncList;
+    std::vector<SynchronisableVariableBase*> stringList;
     uint32_t dataSize_; //size of all variables except strings
     static uint8_t state_; // detemines wheter we are server (default) or client
@@ -196 +197 @@
 
 //   template <class T> void Synchronisable::unregisterVariable(T& var){
-//     std::list<SynchronisableVariableBase*>::iterator it = syncList.begin();
+//     std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin();
 //     while(it!=syncList.end()){
 //       if( ((*it)->getReference()) == &var ){