Changeset 66

Timestamp:

Jul 11, 2010, 10:48:39 AM (14 years ago)

Author:

Torben Dannhauer

Message:

ENet debugging/improvements

Location:

osgVisual

Files:

• include/cluster/dataIO_clusterENet.h (modified) (2 diffs)
• include/cluster/dataIO_clusterENet_implementation.h (modified) (4 diffs)
• src/cluster/dataIO_clusterENet.cpp (modified) (1 diff)
• src/cluster/dataIO_clusterENet_implementation.cpp (modified) (17 diffs)

osgVisual/include/cluster/dataIO_clusterENet.h

@@ -20 +20 @@
 
 #include <dataIO_cluster.h>
+#include <dataIO_clusterENet_implementation.h>
 
 namespace osgVisual
@@ -48 +49 @@
         bool waitForAllReadyToSwap();
         bool sendSwapCommand();
+
+private:
+        osg::ref_ptr<osgVisual::dataIO_clusterENet_implementation> enet_impl;
 };
 

osgVisual/include/cluster/dataIO_clusterENet_implementation.h

@@ -4 +4 @@
 #endif // _MSC_VER > 1000
 
+#include <osg/referenced>
 #include <enet/enet.h>
 #include <iostream>
@@ -9 +10 @@
 #include <vector>
 
+namespace osgVisual
+{
 
-
-class ENet_implementation
+class dataIO_clusterENet_implementation :       public osg::Referenced
 {
 public:
-        ENet_implementation();
-        ~ENet_implementation();
+        dataIO_clusterENet_implementation();
+        ~dataIO_clusterENet_implementation();
 
         enum role {SERVER, CLIENT};
 
-        bool init( ENet_implementation::role role_, unsigned short port_, int maxClients_=10, int maxChannels_=2, int maxInBandwidth_=0, int maxOutBandwidth_=0 );      // client & server                                                              // Done 
+        bool init( dataIO_clusterENet_implementation::role role_, unsigned short port_, int maxClients_=10, int maxChannels_=2, int maxInBandwidth_=0, int maxOutBandwidth_=0 );        // client & server                                                              // Done 
         bool connectTo( const char* remoteAddr_, int connectTimeout_ms_, int clientInfo_=0,  int channelToAlloc_=2 );   // only as client                                                                       // Done
         void sendPacket( ENetPacket* packet_, enet_uint8 channelID_, unsigned int peerID_=0, bool autoFlush_=false );   // by PeerID    // Done
@@ -32 +34 @@
 protected:
         unsigned short port;
-        ENet_implementation::role currentRole;
+        dataIO_clusterENet_implementation::role currentRole;
         static int activeENetInstances;
         bool serverInitialized; // shows if the complete server is initialized. (After init())
@@ -40 +42 @@
         ENetEvent event;
 };
+
+}       // END NAMESPACE

osgVisual/src/cluster/dataIO_clusterENet.cpp

@@ -31 +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;
+        
         sendContainer = sendContainer_;
-        OSG_NOTIFY( osg::ALWAYS ) << "clusterENet init();" << std::endl;
+        
+        // create ENet implementation object.
+        enet_impl = new osgVisual::dataIO_clusterENet_implementation();
 }
 

osgVisual/src/cluster/dataIO_clusterENet_implementation.cpp

@@ -1 +1 @@
 #include "dataIO_clusterENet_implementation.h"
 
-int ENet_implementation::activeENetInstances = 0;
-
-ENet_implementation::ENet_implementation()
+using namespace osgVisual;
+
+int dataIO_clusterENet_implementation::activeENetInstances = 0;
+
+dataIO_clusterENet_implementation::dataIO_clusterENet_implementation()
 {
         std::cout << "Instantiated server class# "<< activeENetInstances << std::endl;
@@ -21 +23 @@
 }
 
-ENet_implementation::~ENet_implementation()
+dataIO_clusterENet_implementation::~dataIO_clusterENet_implementation()
 {
         // Delete Host Object
@@ -35 +37 @@
 }
 
-bool ENet_implementation::init(ENet_implementation::role role_, unsigned short port_, int maxClients_, int maxChannels_, int maxInBandwidth_, int maxOutBandwidth_)
+bool dataIO_clusterENet_implementation::init(dataIO_clusterENet_implementation::role role_, unsigned short port_, int maxClients_, int maxChannels_, int maxInBandwidth_, int maxOutBandwidth_)
 {
         port = port_;
         currentRole = role_;
 
-        if(currentRole == ENet_implementation::SERVER)
+        if(currentRole == dataIO_clusterENet_implementation::SERVER)
         {
                 /* Bind the server to the default localhost.     */
@@ -62 +64 @@
         }       // IF SERVER END
 
-        if(currentRole == ENet_implementation::CLIENT)
+        if(currentRole == dataIO_clusterENet_implementation::CLIENT)
         {
                  host = enet_host_create (NULL /* create a client host */,
@@ -81 +83 @@
 }
 
-void ENet_implementation::processEvents(int timeout_ms_)
+void dataIO_clusterENet_implementation::processEvents(int timeout_ms_)
 {
         if(!serverInitialized)
@@ -117 +119 @@
 }
 
-void ENet_implementation::sendPacket( ENetPacket* packet_, enet_uint8 channelID_, unsigned int peerID_, bool autoFlush_ )
+void dataIO_clusterENet_implementation::sendPacket( ENetPacket* packet_, enet_uint8 channelID_, unsigned int peerID_, bool autoFlush_ )
 {
         // are connected peers available?
         if( peerList.size() == 0 )
         {
-                std::cout << "ENet_implementation::sendPacket() - ERROR: No connected peer available!" << std::endl;
+                std::cout << "dataIO_clusterENet_implementation::sendPacket() - ERROR: No connected peer available!" << std::endl;
                 return;
         }
 
         // Client
-        if(currentRole == ENet_implementation::CLIENT)
+        if(currentRole == dataIO_clusterENet_implementation::CLIENT)
         {
                 enet_peer_send (peerList[0], channelID_, packet_);
@@ -133 +135 @@
 
         // Server
-        if(currentRole == ENet_implementation::SERVER)
+        if(currentRole == dataIO_clusterENet_implementation::SERVER)
         {
                 if(peerID_ < peerList.size())
                         enet_peer_send (peerList[peerID_], channelID_, packet_);
                 else
-                        std::cout << "ENet_implementation::sendPacket() - ERROR: Peer #"<<peerID_<<" is not available, only peers 0-"<<(peerList.size()-1)<<" are connected!" << std::endl;
+                        std::cout << "dataIO_clusterENet_implementation::sendPacket() - ERROR: Peer #"<<peerID_<<" is not available, only peers 0-"<<(peerList.size()-1)<<" are connected!" << std::endl;
         }
 
@@ -145 +147 @@
 }
 
-void ENet_implementation::sendPacket( ENetPacket* packet_, enet_uint8 channelID_, std::string peerName_, bool autoFlush_ )
+void dataIO_clusterENet_implementation::sendPacket( ENetPacket* packet_, enet_uint8 channelID_, std::string peerName_, bool autoFlush_ )
 {
                 // are connected peers available?
         if( peerList.size() == 0 )
         {
-                std::cout << "ENet_implementation::sendPacket() - ERROR: No connected peer available!" << std::endl;
+                std::cout << "dataIO_clusterENet_implementation::sendPacket() - ERROR: No connected peer available!" << std::endl;
                 return;
         }
 
         // Client
-        if(currentRole == ENet_implementation::CLIENT)
+        if(currentRole == dataIO_clusterENet_implementation::CLIENT)
         {
                 enet_peer_send (peerList[0], channelID_, packet_);
@@ -161 +163 @@
 
         // Server
-        if(currentRole == ENet_implementation::SERVER)
+        if(currentRole == dataIO_clusterENet_implementation::SERVER)
         {
                 int peerID_=-1;
@@ -175 +177 @@
                         enet_peer_send (peerList[peerID_], channelID_, packet_);
                 else
-                        std::cout << "ENet_implementation::sendPacket() - ERROR: Peer #"<<peerID_<<" is not available, only peers 0-"<<(peerList.size()-1)<<" are connected!" << std::endl;
+                        std::cout << "dataIO_clusterENet_implementation::sendPacket() - ERROR: Peer #"<<peerID_<<" is not available, only peers 0-"<<(peerList.size()-1)<<" are connected!" << std::endl;
         }
 
@@ -182 +184 @@
 }
 
-void ENet_implementation::broadcastPacket( enet_uint8 channelID_, ENetPacket* packet_, bool autoFlush_ )
-{
-        if(currentRole != ENet_implementation::SERVER)
+void dataIO_clusterENet_implementation::broadcastPacket( enet_uint8 channelID_, ENetPacket* packet_, bool autoFlush_ )
+{
+        if(currentRole != dataIO_clusterENet_implementation::SERVER)
                 return;
 
@@ -192 +194 @@
 }
 
-bool ENet_implementation::connectTo( const char* remoteAddr_, int connectTimeout_ms_, int clientInfo_,  int channelToAlloc_ )
-{
-        if(currentRole != ENet_implementation::CLIENT)
+bool dataIO_clusterENet_implementation::connectTo( const char* remoteAddr_, int connectTimeout_ms_, int clientInfo_,  int channelToAlloc_ )
+{
+        if(currentRole != dataIO_clusterENet_implementation::CLIENT)
                 return false;
 
@@ -235 +237 @@
 }
 
-void ENet_implementation::onReceivePacket(ENetEvent* event_)
+void dataIO_clusterENet_implementation::onReceivePacket(ENetEvent* event_)
 {
                 std::string datastring;
@@ -250 +252 @@
 }
 
-void ENet_implementation::onConnect(ENetEvent* event_)
+void dataIO_clusterENet_implementation::onConnect(ENetEvent* event_)
 {
         /* Get connect remote IP */
@@ -266 +268 @@
 }
 
-void ENet_implementation::onDisconnect(ENetEvent* event_)
+void dataIO_clusterENet_implementation::onDisconnect(ENetEvent* event_)
 {
         // remove peer pionter from peerList
@@ -280 +282 @@
 
 
-        if(currentRole == ENet_implementation::SERVER)
+        if(currentRole == dataIO_clusterENet_implementation::SERVER)
         {
                 std::cout << "Client " << (char*)event_->peer->data << " disconnected." << std::endl;
@@ -289 +291 @@
         }
 
-        if(currentRole == ENet_implementation::CLIENT)
+        if(currentRole == dataIO_clusterENet_implementation::CLIENT)
         {
                 std::cout << "Server "<< (char*)event_->peer->data<<"disconnected." << std::endl;