Changeset 186

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

Files:

• include/cluster/dataIO_cluster.h (modified) (2 diffs)
• include/dataIO/visual_dataIO.h (modified) (1 diff)
• include/extLink/dataIO_extLink.h (modified) (2 diffs)
• include/extLink/dataIO_extLinkDummy.h (modified) (1 diff)
• include/extLink/dataIO_extLinkVCL.h (modified) (1 diff)
• src/cluster/dataIO_clusterDummy.cpp (modified) (2 diffs)
• src/cluster/dataIO_clusterENet.cpp (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (5 diffs)
• src/extLink/dataIO_extLinkDummy.cpp (modified) (1 diff)
• src/extLink/dataIO_extLinkVCL.cpp (modified) (2 diffs)

osgVisual/trunk/include/cluster/dataIO_cluster.h

@@ -69 +69 @@
 
         /**
-         * \brief Pure virtual function for initialization. Must be implemented in derived class.
+         * \brief Pure virtual function for XML configuration. Must be implemented in derived class.
          * 
          */ 
@@ -82 +82 @@
 
         /**
-         * \brief Pure virtual function for initialization. Must be implemented in derived class.
+         * \brief Pure virtual function for shutdown. Must be implemented in derived class.
          * 
          */ 

osgVisual/trunk/include/dataIO/visual_dataIO.h

@@ -133 +133 @@
          * @return : True if parsing was successful.
          */ 
-        bool processXMLConfiguration(xmlNode* extLinkConfig_); 
+        bool processXMLConfiguration(); 
 
         /**

osgVisual/trunk/include/extLink/dataIO_extLink.h

@@ -19 +19 @@
 #include <osg/Node>
 #include <dataIO_slot.h>
+
+// XML Parser
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 
@@ -54 +59 @@
          * 
          */ 
-        virtual void init() = 0;
+        virtual bool init( xmlNode* configurationNode) = 0;
 
+        /**
+         * \brief Pure virtual function for XML configuration. Must be implemented in derived class.
+         * 
+         */ 
+        virtual bool processXMLConfiguration(xmlNode* extLinkConfig_) = 0;
+
+        /**
+         * \brief Pure virtual function for shutdown. Must be implemented in derived class.
+         * 
+         */ 
         virtual void shutdown() = 0;
 

osgVisual/trunk/include/extLink/dataIO_extLinkDummy.h

@@ -37 +37 @@
         virtual ~dataIO_extLinkDummy(void);
 
-        void init();
+        bool processXMLConfiguration(xmlNode* extLinkConfig_);
+        bool init(xmlNode* configurationNode);
         void shutdown();
 

osgVisual/trunk/include/extLink/dataIO_extLinkVCL.h

@@ -79 +79 @@
         virtual ~dataIO_extLinkVCL(void);
 
-        void init();
+        bool init(xmlNode* configurationNode);
+        bool processXMLConfiguration(xmlNode* extLinkConfig_);
         void shutdown();
 

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;

osgVisual/trunk/src/dataIO/visual_dataIO.cpp

@@ -54 +54 @@
         viewer = viewer_;
 
-        // Process XML configuration
+        // Process XML configuration - all XML dependen initializations are performed in processXMLConfiguration()
         this->configFileName = configFileName;
-        xmlNode *extLinkConfig=NULL;
-        if(!processXMLConfiguration(extLinkConfig))
+        if(!processXMLConfiguration())
                 OSG_FATAL << "ERROR: visual_dataIO::init() - Failed to initialize dataIO via XML configuration!";
 
-        // Create extLink.
-        #ifdef USE_EXTLINK_DUMMY
-                extLink = new dataIO_extLinkDummy( dataSlots );
-        #endif
-        #ifdef USE_EXTLINK_VCL
-                extLink = new dataIO_extLinkVCL( dataSlots );
-        #endif
-        extLink->init();
-
-        
         // Install callbacks to perform DataIO activities every frame:
         //// EventCallback at the absolute beginning of the frame
@@ -81 +70 @@
 }
 
-bool visual_dataIO::processXMLConfiguration(xmlNode* extLinkConfig_)
+bool visual_dataIO::processXMLConfiguration()
 {
         // Init XML
@@ -87 +76 @@
         bool disabled;
         xmlNode* config = util::getModuleXMLConfig( configFileName, "dataio", tmpDoc, disabled );
-        xmlNode* clusterConfig = NULL;
+        xmlNode* clusterConfig = NULL, *extLinkConfig = NULL;
 
         if( disabled)
@@ -147 +136 @@
                         if(cur_node->type == XML_ELEMENT_NODE && node_name == "extlink")
                         {
-                                // Check Attributes to determine if the dummy implementation or any other implementation must be instantiated
-
-                                // Pass XML attributes to extlink to analyse and configure it by extLink itself
+                                // Pass extLink configuration to the used extLink implementation. 
+                                // The implementation will use the configuration if it matches, otherwise falls back to dummy extLink
+                                extLinkConfig = cur_node;
                         }
 
                 }       // FOR all nodes END
-
 
 
@@ -169 +157 @@
                 }
 
+                // Create extLink.
+                #ifdef USE_EXTLINK_VCL
+                        extLink = new dataIO_extLinkVCL( dataSlots );
+                #endif
+                if( !extLink.valid() || !extLinkConfig || !extLink->init(extLinkConfig) )
+                {
+                        extLink = new dataIO_extLinkDummy( dataSlots );
+                        extLink->init(extLinkConfig);
+                }
 
 

osgVisual/trunk/src/extLink/dataIO_extLinkDummy.cpp

@@ -32 +32 @@
 }
 
-void dataIO_extLinkDummy::init()
+bool dataIO_extLinkDummy::init(xmlNode* configurationNode)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "extLinkDummy init()" << std::endl;
+        return true;
+}
+
+bool dataIO_extLinkDummy::processXMLConfiguration(xmlNode* extLinkConfig_)
+{
+        OSG_NOTIFY( osg::ALWAYS ) << "extLinkDummy processXMLConfiguration()" << std::endl;
+        return true;
 }
 

osgVisual/trunk/src/extLink/dataIO_extLinkVCL.cpp

@@ -31 +31 @@
 }
 
-void dataIO_extLinkVCL::init()
-{
+bool dataIO_extLinkVCL::init(xmlNode* configurationNode)
+{
+        if (!configurationNode || !processXMLConfiguration(configurationNode))
+                return false;
+
         OSG_NOTIFY( osg::ALWAYS ) << "extLinkVCL init()" << std::endl;
 
-        VCLConfigFilename = "osgVisual.xml";
-        
         if ( osgDB::fileExists( VCLConfigFilename ) )
         {
@@ -47 +48 @@
         else
         {
-                OSG_NOTIFY( osg::FATAL ) << "ERROR: Could not find VCL Configuration file " << VCLConfigFilename << std::endl;
-                exit(-1);
-        }
-
+                OSG_NOTIFY( osg::FATAL ) << "ERROR: Could not find VCL Configuration file '" << VCLConfigFilename << "', falling back to extLinkDummy" << std::endl;
+                return false;
+        }
+        return true;
+}
+
+bool dataIO_extLinkVCL::processXMLConfiguration(xmlNode* extLinkConfig_)
+{
+        // Extract VCL config file
+        xmlAttr  *attr = extLinkConfig_->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 != "vcl")
+                        {
+                                OSG_NOTIFY( osg::ALWAYS ) << "WARNING: extLink configuration does not match the currently used 'vcl' implementation, falling back to extLinkDummy" << std::endl;
+                                return false;
+                        }
+                }
+                if( attr_name == "filename" )
+                {
+                        VCLConfigFilename = attr_value;
+                }
+                attr = attr->next; 
+        }       // WHILE attrib END
+
+        return true;
 }