Changeset 9909 in orxonox.OLD

Timestamp:

Oct 30, 2006, 10:35:23 PM (18 years ago)

Author:

rennerc

Message:

ClassID synchronization might work. at least it still works with it

Location:

branches/network/src/lib

Files:

• lang/object_list.cc (modified) (1 diff)
• lang/object_list.h (modified) (1 diff)
• network/Makefile.am (modified) (2 diffs)
• network/handshake.cc (modified) (3 diffs)
• network/handshake.h (modified) (1 diff)
• network/network_stream.cc (modified) (1 diff)
• network/synchronizeable_var/synchronizeable_classid_list.cc (added)
• network/synchronizeable_var/synchronizeable_classid_list.h (added)

branches/network/src/lib/lang/object_list.cc

@@ -330 +330 @@
     return -1;
 }
+
+
+/**
+ * replace all ids. list must contain all (and no more) ids
+ * @param str2id list: string -> newId
+ */
+void ObjectListBase::replaceIDMap( const std::map< std::string, int >& str2id )
+{
+  if ( str2id.size() != _classesByID->size() )
+  {
+    assert( false && "size of str2id does not match" );
+  }
+  
+  IDMap * map = new IDMap();
+  
+  std::map< std::string, int >::const_iterator it;
+  for ( it = str2id.begin(); it != str2id.end(); it++ )
+  {
+    assert( _classesByName->find( it->first ) != _classesByName->end() );
+    (*map)[ it->second ] =  (*_classesByName)[it->first];
+  }
+  
+  delete _classesByID;
+  _classesByID = map;
+}
+
+/**
+ * 
+ * @return 
+ */
+std::map< std::string, int > * ObjectListBase::createStrToId( )
+{
+  std::map< std::string, int > * res = new std::map< std::string, int >();
+  
+  NameMap::const_iterator it;
+  for ( it = _classesByName->begin(); it != _classesByName->end(); it++ )
+  {
+    IDMap::const_iterator it2;
+    int id = -1;
+    for ( it2 = _classesByID->begin(); it2 != _classesByID->end(); it2++ )
+    {
+      if ( it->second == it2->second )
+      {
+        id = it2->first;
+        break;
+      }
+    }
+    
+    assert( id != -1 );
+    (*res)[ it->first ] = id;
+  }
+  
+  return res;
+}

branches/network/src/lib/lang/object_list.h

@@ -133 +133 @@
   static NameMap*               _classesByName;     //!< A Map of all the classes in existance.
   static std::list<std::string> _classNames;        //!< A list of all the registered ClassNames.
+  
+public:
+  static void replaceIDMap( const std::map<std::string, int>& str2id );
+  static std::map<std::string, int>* createStrToId();
 };
 

branches/network/src/lib/network/Makefile.am

@@ -44 +44 @@
                       synchronizeable_var/synchronizeable_ip.cc \
                       synchronizeable_var/synchronizeable_classid.cc \
+                      synchronizeable_var/synchronizeable_classid_list.cc \
                       \
                       ip.cc
@@ -96 +97 @@
                 synchronizeable_var/synchronizeable_ip.h \
                 synchronizeable_var/synchronizeable_classid.h \
+                synchronizeable_var/synchronizeable_classid_list.h \
                 \
                 ip.h

branches/network/src/lib/network/handshake.cc

@@ -22 +22 @@
 #include "debug.h"
 
+#include "synchronizeable_var/synchronizeable_classid_list.h"
+
+std::map< std::string, int >* Handshake::classIdList = NULL;
 
 ObjectListDefinition(Handshake);
@@ -32 +35 @@
   this->registerObject(this, Handshake::_objectList);
 
+  if ( !Handshake::classIdList )
+  {
+    //TODO who else?
+    if ( SharedNetworkData::getInstance()->isMasterServer() )
+    {
+      Handshake::classIdList = ObjectListBase::createStrToId();
+    }
+    else
+    {
+      Handshake::classIdList = new std::map< std::string, int >();
+    }
+  }
 
   // register all variable handlers
@@ -52 +67 @@
   registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableInt( &this->redirectProxy, &this->redirectProxy, "proxy server redirection flag", PERMISSION_MASTER_SERVER ) );
+  
+  registerVar( new SynchronizeableClassIDList( Handshake::classIdList, Handshake::classIdList, "classId List", PERMISSION_MASTER_SERVER ) );
 
 

branches/network/src/lib/network/handshake.h

@@ -118 +118 @@
     IP                 proxy1;                               //!< ip address of the first proxy (0.0.0.0 of not available)
     IP                 proxy2;                               //!< ip address of the second proxy (0.0.0.0 of not available)
+    
+    static std::map< std::string, int >* classIdList;
+  public:
+    std::map< std::string, int >* getClassIdList(){ return classIdList; }
 };
 

branches/network/src/lib/network/network_stream.cc

@@ -716 +716 @@
               // init the new message manager
               MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
+              ObjectListBase::replaceIDMap( *(it->second.handshake->getClassIdList()) );
             }