Changeset 7878 for code/branches/network6/src/libraries/network/Connection.cc

Timestamp:

Feb 13, 2011, 9:34:22 PM (13 years ago)

Author:

scheusso

Message:

-some cleaning up
-fixing disconnect behaviour
-trying to find a bug

File:

• code/branches/network6/src/libraries/network/Connection.cc (modified) (13 diffs)

code/branches/network6/src/libraries/network/Connection.cc

@@ -38 +38 @@
 
 #include "packet/Packet.h"
+#include <util/Sleep.h>
 
 namespace orxonox
 {
   const boost::posix_time::millisec NETWORK_COMMUNICATION_THREAD_WAIT_TIME(20);
+  const unsigned int                NETWORK_DISCONNECT_TIMEOUT = 500;
 
   Connection::Connection(uint32_t firstPeerID):
@@ -50 +52 @@
     this->incomingEventsMutex_ = new boost::mutex;
     this->outgoingEventsMutex_ = new boost::mutex;
+    this->overallMutex_ = new boost::mutex;
   }
 
@@ -77 +80 @@
   void Connection::disconnectPeer(uint32_t peerID)
   {
+    this->overallMutex_->lock();
     outgoingEvent outEvent = { peerID, outgoingEventType::disconnectPeer, 0, 0 };
     
@@ -82 +86 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
+    this->overallMutex_->unlock();
   }
   
@@ -95 +100 @@
   void Connection::addPacket(ENetPacket* packet, uint32_t peerID, uint8_t channelID)
   {
+    this->overallMutex_->lock();
     outgoingEvent outEvent = { peerID, outgoingEventType::sendPacket, packet, channelID };
     
@@ -100 +106 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
+    this->overallMutex_->unlock();
   }
   
   void Connection::broadcastPacket(ENetPacket* packet, uint8_t channelID)
   {
+    this->overallMutex_->lock();
     outgoingEvent outEvent = { 0, outgoingEventType::broadcastPacket, packet, channelID };
     
@@ -109 +117 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
+    this->overallMutex_->unlock();
   }
 
@@ -116 +125 @@
     ENetEvent event;
     
+    this->overallMutex_->lock();
     while( bCommunicationThreadRunning_ )
     {
@@ -123 +133 @@
         processIncomingEvent(event);
       }
+      
+      this->overallMutex_->unlock();
+      msleep(10);
+      this->overallMutex_->lock();
       
       // Send all waiting outgoing packets
@@ -149 +163 @@
       }
     }
+    this->overallMutex_->unlock();
   }
   
@@ -209 +224 @@
         break;
       case outgoingEventType::disconnectPeers:
-        while( this->peerMap_.size()!=0 )
-        {
-          peer = this->peerMap_.begin()->second;
-          enet_peer_disconnect(peer, 0);
-        }
+        disconnectPeersInternal();
         break;
       case outgoingEventType::broadcastPacket:
@@ -223 +234 @@
   }
 
+
+  void Connection::disconnectPeersInternal()
+  {
+    std::map<uint32_t, ENetPeer*>::iterator it;
+    for( it=this->peerMap_.begin(); it!=this->peerMap_.end(); ++it )
+    {
+      enet_peer_disconnect(it->second, 0);
+    }
+    uint32_t iterations = NETWORK_DISCONNECT_TIMEOUT/NETWORK_WAIT_TIMEOUT;
+    uint32_t i = 0;
+    while( this->peerMap_.size() && i++ < iterations )
+    {
+      ENetEvent event;
+      if( enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
+      {
+        processIncomingEvent(event);
+      }
+    }
+  }
 
   void Connection::processQueue()
@@ -261 +291 @@
     }
   }
+  
+  void Connection::waitOutgoingQueue()
+  {
+    uint32_t outgoingEventsCount;
+    this->outgoingEventsMutex_->lock();
+    outgoingEventsCount = this->outgoingEvents_.size();
+    this->outgoingEventsMutex_->unlock();
+    while( outgoingEventsCount )
+    {
+      msleep(1);
+      this->outgoingEventsMutex_->lock();
+      outgoingEventsCount = this->outgoingEvents_.size();
+      this->outgoingEventsMutex_->unlock();
+    }
+  }
+
 
   incomingEvent Connection::preprocessConnectEvent(ENetEvent& event)