Changeset 183 for osgVisual/trunk/src

Timestamp:

Jan 7, 2011, 5:41:45 PM (13 years ago)

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO cluster

Location:

osgVisual/trunk/src

Files:

• cluster/dataIO_clusterDummy.cpp (modified) (2 diffs)
• cluster/dataIO_clusterENet.cpp (modified) (4 diffs)
• dataIO/visual_dataIO.cpp (modified) (8 diffs)
• sky_Silverlining/visual_skySilverLining.cpp (modified) (2 diffs)

osgVisual/trunk/src/cluster/dataIO_clusterDummy.cpp

@@ -29 +29 @@
 }
 
-void dataIO_clusterDummy::init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
+bool dataIO_clusterDummy::init(xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_)
 {
         sendContainer = sendContainer_;
         OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy init();" << std::endl;
+        return true;
+}
+
+bool dataIO_clusterDummy::processXMLConfiguration(xmlNode* clusterConfig_)
+{
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy processXMLConfiguration();" << std::endl;
+        return true;
 }
 
@@ -40 +47 @@
 }
 
-bool dataIO_clusterDummy::sendTO_OBJvaluesToSlaves()
+bool dataIO_clusterDummy::sendTO_OBJvaluesToSlaves(osg::Matrixd viewMatrix_)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "clusterDummy sendTO_OBJvaluesToSlaves()" << std::endl;

osgVisual/trunk/src/cluster/dataIO_clusterENet.cpp

@@ -35 +35 @@
 
 
-void dataIO_clusterENet::init( osg::ArgumentParser& arguments_, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
-{
+bool dataIO_clusterENet::init(xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_)
+{
+        if (!configurationNode || !processXMLConfiguration(configurationNode))
+                return false;
+
         OSG_NOTIFY( osg::ALWAYS ) << "clusterENet init();" << std::endl;
         
@@ -56 +59 @@
                 writeOptionString = "Ascii";
         }
-        if (compressionEnabled_)
+        if (compressionEnabled)
                 writeOptionString+=" Compressor=zlib";
         readOptions = new osgDB::Options( readOptionString.c_str() );
@@ -77 +80 @@
         if(clusterMode == SLAVE)
         {
-                // Get the server IP
-                if(!arguments_.read("--server",serverToConnect, port))
-                {
-                        // try server discovery
-                        //discoverServer(serverToConnect,port);
-                        /* todo : implement a udp server discovery based on ASIO */
-                }
-
                 // Init ENet
                 enet_impl->init(dataIO_clusterENet_implementation::CLIENT, port);
@@ -105 +100 @@
                         initialized = false;
                         std::cout << "Finally failed to establish connection to server " << serverToConnect << std::endl;
-                        exit(-1);
+                        return false;
                 }
         }       // IF SLAVE END
+
+        return true;
+}
+
+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 '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;
 }
 

osgVisual/trunk/src/dataIO/visual_dataIO.cpp

@@ -49 +49 @@
 void visual_dataIO::init(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_, std::string configFileName)
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize.." << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize..";
 
         // Init variables
@@ -56 +56 @@
         // Process XML configuration
         this->configFileName = configFileName;
-        if(!processXMLConfiguration())
+        xmlNode *extLinkConfig=NULL;
+        if(!processXMLConfiguration(extLinkConfig))
                 OSG_FATAL << "ERROR: visual_dataIO::init() - Failed to initialize dataIO via XML configuration!";
-
-
-        // Create Cluster.
-        #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
-                cluster = new dataIO_clusterAsioTcpIostream();
-        #endif 
-        #ifdef USE_CLUSTER_ENET
-                cluster = new dataIO_clusterENet();
-                cluster->enableHardSync( false );       /** \todo : rebuild this structure in cluster.h and move it this way to a general implementation. */
-        #endif
-        #ifdef USE_CLUSTER_DUMMY
-                cluster = new dataIO_clusterDummy();
-        #endif
-        if(cluster.valid())
-                //cluster->init(arguments_, clusterMode, slotContainer, true, false);
-                cluster->init(arguments_, viewer_, clusterMode, slotContainer, false, false);
 
         // Create extLink.
@@ -85 +70 @@
 
         
-
         // Install callbacks to perform DataIO activities every frame:
         //// EventCallback at the absolute beginning of the frame
@@ -97 +81 @@
 }
 
-bool visual_dataIO::processXMLConfiguration()
+bool visual_dataIO::processXMLConfiguration(xmlNode* extLinkConfig_)
 {
         // Init XML
@@ -103 +87 @@
         bool disabled;
         xmlNode* config = util::getModuleXMLConfig( configFileName, "dataio", tmpDoc, disabled );
+        xmlNode* clusterConfig = NULL;
 
         if( disabled)
                 OSG_NOTIFY( osg::ALWAYS ) << "..disabled by XML configuration file. dataIO can't be disabled. Ignoring." << std::endl;
+        else
+                OSG_NOTIFY( osg::ALWAYS ) << std::endl;
 
         // extract configuration values
@@ -152 +139 @@
                         if(cur_node->type == XML_ELEMENT_NODE && node_name == "cluster")
                         {
-                                // Check Attributes to determine if the dummy implementation or any other implementation must be instantiated
-
-                                // Pass XML attributes to cluster to analyse and configure it by cluster itself
+                                // Pass cluster configuration to the used cluster implementation. 
+                                // The implementation will use the configuration if it matches, otherwise falls back to dummy cluster
+                                clusterConfig = cur_node;
                         }
 
@@ -166 +153 @@
 
                 }       // FOR all nodes END
+
+
+
+                // Create Cluster.
+                #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
+                        cluster = new dataIO_clusterAsioTcpIostream();
+                #endif 
+                #ifdef USE_CLUSTER_ENET
+                        cluster = new dataIO_clusterENet();
+                #endif
+                if( !cluster.valid() || !clusterConfig || !cluster->init(clusterConfig, viewer, clusterMode, slotContainer, false) )
+                {
+                        cluster = new dataIO_clusterDummy();
+                        cluster->init(clusterConfig, viewer, clusterMode, slotContainer, false);
+                }
+
+
 
                 // clean up
@@ -176 +180 @@
                 return false;
         }
-
         return true;
 }

osgVisual/trunk/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -21 +21 @@
 visual_skySilverLining::visual_skySilverLining(osgViewer::Viewer* viewer_, std::string configFileName, bool& disabled)
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_skySilverlining...";
+        OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_skySilverlining..." << std::endl;
 
         atmosphereInitialized = false;
@@ -41 +41 @@
         if( disabled)
                 OSG_NOTIFY( osg::ALWAYS ) << "..disabled by XML configuration file." << std::endl;
-        else
-                OSG_NOTIFY( osg::ALWAYS ) << std::endl;
+ 
         if(config)
                 xmlFreeDoc(tmpDoc); xmlCleanupParser();