Changeset 186 for osgVisual/trunk/src/cluster

Timestamp:

Jan 8, 2011, 8:13:43 PM (14 years ago)

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO extLink

Location:

osgVisual/trunk/src/cluster

Files:

• dataIO_clusterDummy.cpp (modified) (2 diffs)
• dataIO_clusterENet.cpp (modified) (1 diff)

osgVisual/trunk/src/cluster/dataIO_clusterDummy.cpp

@@ -32 +32 @@
 {
         sendContainer = sendContainer_;
-        OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy init();" << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy init()" << std::endl;
         return true;
 }
@@ -38 +38 @@
 bool dataIO_clusterDummy::processXMLConfiguration(xmlNode* clusterConfig_)
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy processXMLConfiguration();" << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy processXMLConfiguration()" << std::endl;
         return true;
 }

osgVisual/trunk/src/cluster/dataIO_clusterENet.cpp

@@ -109 +109 @@
 bool dataIO_clusterENet::processXMLConfiguration(xmlNode* clusterConfig_)
 {
-                                // Extract cluster role
-                                xmlAttr  *attr = clusterConfig_->properties;
-                                while ( attr ) 
-                                { 
-                                        std::string attr_name=reinterpret_cast<const char*>(attr->name);
-                                        std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                        if( attr_name == "implementation" )
-                                        {
-                                                if(attr_value != "enet")
-                                                {
-                                                        OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the currently used 'enet' implementation, falling back to clusterDummy" << std::endl;
-                                                        return false;
-                                                }
-                                        }
-                                        if( attr_name == "hardsync" )
-                                        {
-                                                if(attr_value == "yes")
-                                                        hardSync = true;
-                                                else
-                                                        hardSync = false;
-                                        }
-                                        if( attr_name == "master_ip" )
-                                        {
-                                                serverToConnect = attr_value;
-                                        }
-                                        if( attr_name == "port" )
-                                        {
-                                                std::istringstream i(attr_value);
-                                                if (!(i >> port))
-                                                {
-                                                        OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration : Invalid port number '" << attr_value << "', falling back to clusterDummy" << std::endl;
-                                                        return false;
-                                                }
-                                        }
-                                        if( attr_name == "use_zlib_compressor" )
-                                        {
-                                                if(attr_value == "yes")
-                                                        compressionEnabled = true;
-                                                else
-                                                        compressionEnabled = false;
-                                        }
-                                        attr = attr->next; 
-                                }       // WHILE attrib END
+        // Extract cluster role
+        xmlAttr  *attr = clusterConfig_->properties;
+        while ( attr ) 
+        { 
+                std::string attr_name=reinterpret_cast<const char*>(attr->name);
+                std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
+                if( attr_name == "implementation" )
+                {
+                        if(attr_value != "enet")
+                        {
+                                OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the currently used 'enet' implementation, falling back to clusterDummy" << std::endl;
+                                return false;
+                        }
+                }
+                if( attr_name == "hardsync" )
+                {
+                        if(attr_value == "yes")
+                                hardSync = true;
+                        else
+                                hardSync = false;
+                }
+                if( attr_name == "master_ip" )
+                {
+                        serverToConnect = attr_value;
+                }
+                if( attr_name == "port" )
+                {
+                        std::istringstream i(attr_value);
+                        if (!(i >> port))
+                        {
+                                OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration : Invalid port number '" << attr_value << "', falling back to clusterDummy" << std::endl;
+                                return false;
+                        }
+                }
+                if( attr_name == "use_zlib_compressor" )
+                {
+                        if(attr_value == "yes")
+                                compressionEnabled = true;
+                        else
+                                compressionEnabled = false;
+                }
+                attr = attr->next; 
+        }       // WHILE attrib END
 
         return true;