Changeset 59 for osgVisual/src

Timestamp:

May 30, 2010, 7:50:59 PM (14 years ago)

Author:

Torben Dannhauer

Message:

updated cluster functionality to allow build with any cluster module selected.

Location:

osgVisual/src

Files:

• cluster/dataIO_clusterAsioTcpIostream.cpp (modified) (5 diffs)
• cluster/dataIO_clusterDummy.cpp (modified) (2 diffs)
• cluster/dataIO_clusterUDP.cpp (modified) (1 diff)
• dataIO/visual_dataIO.cpp (modified) (1 diff)

osgVisual/src/cluster/dataIO_clusterAsioTcpIostream.cpp

@@ -21 +21 @@
 dataIO_clusterAsioTcpIostream::dataIO_clusterAsioTcpIostream()
 {
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterAsioTcpIostream constructed" << std::endl;
 }
 
 dataIO_clusterAsioTcpIostream::~dataIO_clusterAsioTcpIostream(void)
 {
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterAsioTcpIostream destructed" << std::endl;
 }
 
-void dataIO_clusterAsioTcpIostream::init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
+void dataIO_clusterAsioTcpIostream::init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
 {
-
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterAsioTcpIostream init()" << std::endl;
 }
 
 void dataIO_clusterAsioTcpIostream::shutdown()
 {
-
+        OSG_NOTIFY( osg::ALWAYS ) << "clusterAsioTcpIostream shutdown()" << std::endl;
 }
 
 bool dataIO_clusterAsioTcpIostream::sendTO_OBJvaluesToSlaves()
 {
-
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream sendTO_OBJvaluesToSlaves()" << std::endl;
         return true;
 }
@@ -45 +47 @@
 bool dataIO_clusterAsioTcpIostream::readTO_OBJvaluesFromMaster()
 {
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream readTO_OBJvaluesFromMaster()" << std::endl;
 
         return true;
@@ -51 +54 @@
 void dataIO_clusterAsioTcpIostream::reportAsReadyToSwap()
 {
-
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream reportAsReadyToSwap()" << std::endl;
 }
 
 bool dataIO_clusterAsioTcpIostream::waitForSwap()
 {
-
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream waitForSwap()" << std::endl;
         return true;
 }
@@ -62 +65 @@
 bool dataIO_clusterAsioTcpIostream::waitForAllReadyToSwap()
 {
-
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream waitForAllReadyToSwap()" << std::endl;
         return true;
 }
@@ -68 +71 @@
 bool dataIO_clusterAsioTcpIostream::sendSwapCommand()
 {
-
+        OSG_NOTIFY( osg::INFO ) << "clusterAsioTcpIostream sendSwapCommand()" << std::endl;
         return true;
 }

osgVisual/src/cluster/dataIO_clusterDummy.cpp

@@ -17 +17 @@
 #include "dataIO_clusterDummy.h"
 
-#include "memoryLeakDetection.h"
+using namespace osgVisual;
 
 dataIO_clusterDummy::dataIO_clusterDummy()
@@ -29 +29 @@
 }
 
-void dataIO_clusterDummy::init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
+void dataIO_clusterDummy::init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
 {
         sendContainer = sendContainer_;

osgVisual/src/cluster/dataIO_clusterUDP.cpp

@@ -34 +34 @@
 }
 
-void dataIO_clusterUDP::init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
+void dataIO_clusterUDP::init( osg::ArgumentParser& arguments_, osgVisual::dataIO_cluster::clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ )
 {
         // set Variables

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -77 +77 @@
                 cluster = new dataIO_clusterUDP();
         #endif
-        cluster->init(arguments_, slotContainer, true, false);
+        cluster->init(arguments_, clusterMode, slotContainer, true, false);
 
         // Create extLink.