Changeset 67

Timestamp:

Jul 11, 2010, 1:31:29 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• include/cluster/dataIO_cluster.h (modified) (1 diff)
• include/cluster/dataIO_clusterAsioTcpIostream.h (modified) (1 diff)
• include/cluster/dataIO_clusterENet.h (modified) (1 diff)
• include/core/visual_core.h (modified) (1 diff)
• src/cluster/dataIO_clusterENet.cpp (modified) (7 diffs)
• src/cluster/dataIO_clusterENet_implementation.cpp (modified) (2 diffs)
• src/core/visual_core.cpp (modified) (3 diffs)
• src/dataIO/visual_dataIO.cpp (modified) (1 diff)

osgVisual/include/cluster/dataIO_cluster.h

@@ -117 +117 @@
 
 protected:
+        osgVisual::dataIO_cluster::clustermode clusterMode;     // This variable only mirrors the variable of dataIO. willbe set during initialize.
+        bool initialized;
+        int port;
+
         osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;
 };

osgVisual/include/cluster/dataIO_clusterAsioTcpIostream.h

@@ -60 +60 @@
 
 private:
-        osgVisual::dataIO_cluster::clustermode clusterMode;
-        bool initialized;
-        int port;       // Defaults to 5678 
-        
         /**
          * This list contains the connections to communicate with in each frame. 

osgVisual/include/cluster/dataIO_clusterENet.h

@@ -52 +52 @@
 private:
         osg::ref_ptr<osgVisual::dataIO_clusterENet_implementation> enet_impl;
+        std::string serverToConnect;
+        osgVisual::dataIO_cluster::clustermode clusterMode;
 };
 

osgVisual/include/core/visual_core.h

@@ -98 +98 @@
 
         void addManipulators();
-        void processCommandlineArguments();
         bool loadTerrain(osg::ArgumentParser& arguments_);
         bool checkCommandlineArgumentsForFinalErrors();

osgVisual/src/cluster/dataIO_clusterENet.cpp

@@ -22 +22 @@
 {
         OSG_NOTIFY( osg::ALWAYS ) << "clusterENet constructed" << std::endl;
+        serverToConnect = "unknown";
 }
+
 
 dataIO_clusterENet::~dataIO_clusterENet(void)
@@ -29 +31 @@
 }
 
+
 void dataIO_clusterENet::init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
 {
         OSG_NOTIFY( osg::ALWAYS ) << "clusterENet init();" << std::endl;
         
+        // Configure the clustermode
+        clusterMode = clusterMode_;
+
+        // store sendContainer
         sendContainer = sendContainer_;
         
         // create ENet implementation object.
         enet_impl = new osgVisual::dataIO_clusterENet_implementation();
+
+        // initialize ENet implementation
+        if(clusterMode == MASTER)
+        {
+                enet_impl->init(dataIO_clusterENet_implementation::SERVER, port);
+
+                initialized = true;
+        }
+        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);
+
+                // Connect to server with 5 retries:
+                bool connected = false;
+                for(int i=0; i<5; i++)
+                {
+                        std::cout << "Try to connect to server " << serverToConnect << std::endl;
+                        if( enet_impl->connectTo( serverToConnect.c_str(), 5000 ) )
+                        {
+                                // Connect successful.
+                                initialized = true;
+                                connected = true;
+                                break;
+                        }
+                }       // For END
+                if(!connected)
+                {
+                        initialized = false;
+                        std::cout << "Failed to establish connection to server " << serverToConnect << std::endl;
+                }
+        }       // IF SLAVE END
 }
+
 
 void dataIO_clusterENet::shutdown()
@@ -43 +91 @@
         OSG_NOTIFY( osg::ALWAYS ) << "clusterENet shutdown();" << std::endl;
 }
+
 
 bool dataIO_clusterENet::sendTO_OBJvaluesToSlaves()
@@ -51 +100 @@
 }
 
+
 bool dataIO_clusterENet::readTO_OBJvaluesFromMaster()
 {
@@ -57 +107 @@
         return true;
 }
+
 
 void dataIO_clusterENet::reportAsReadyToSwap()
@@ -70 +121 @@
 }
 
+
 bool dataIO_clusterENet::waitForAllReadyToSwap()
 {
@@ -77 +129 @@
 }
 
+
 bool dataIO_clusterENet::sendSwapCommand()
 {

osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp

@@ -9 +9 @@
         std::cout << "Instantiated server class# "<< activeENetInstances << std::endl;
         serverInitialized = false;
+        host = NULL;
         // Start ENet
         if (activeENetInstances++ == 0)
@@ -25 +26 @@
 dataIO_clusterENet_implementation::~dataIO_clusterENet_implementation()
 {
-        // Delete Host Object
-        enet_host_destroy(host);
+        // Delete Host Object if instantiated
+        if(host)
+                enet_host_destroy(host);
 
         // Stop ENet if it is the last element.

osgVisual/src/core/visual_core.cpp

@@ -56 +56 @@
         OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_core..." << std::endl;
 
-        // Process commandline arguments for configuration parameter
-        processCommandlineArguments();
-        
         // Add manipulators for user interaction
         addManipulators();
@@ -250 +247 @@
 }
 
-void visual_core::processCommandlineArguments()
-{
-        std::cout << "Processing general commandline arguments..." << std::endl;
-
+
+bool visual_core::checkCommandlineArgumentsForFinalErrors()
+{
         // Setup Application Usage
         arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
@@ -275 +271 @@
         viewer->setDone(true);
     }
-}
-
-bool visual_core::checkCommandlineArgumentsForFinalErrors()
-{
+
          // any option left unread are converted into errors to write out later.
     arguments.reportRemainingOptionsAsUnrecognized();

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -56 +56 @@
                 OSG_NOTIFY( osg::ALWAYS ) << "Configure osgVisual as SLAVE" << std::endl;
                 clusterMode = osgVisual::dataIO_cluster::SLAVE;
-                // Slave only recieves container, therefor set this Pointer null.
-                slotContainer = NULL;
+                slotContainer = NULL;   // Slave only recieves container, therefor set this Pointer null.
         }
         else