Changeset 7898 for code/branches/network6

Timestamp:

Feb 15, 2011, 11:37:15 AM (14 years ago)

Author:

scheusso

Message:

trying to fix some uninitialised value warnings from valgrind
remove overall mutex

Location:

code/branches/network6/src/libraries/network

Files:

• Connection.cc (modified) (10 diffs)
• ServerConnection.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (1 diff)

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

@@ -42 +42 @@
 namespace orxonox
 {
-  const boost::posix_time::millisec NETWORK_COMMUNICATION_THREAD_WAIT_TIME(20);
+  const boost::posix_time::millisec NETWORK_COMMUNICATION_THREAD_WAIT_TIME(200);
   const unsigned int                NETWORK_DISCONNECT_TIMEOUT = 500;
 
@@ -52 +52 @@
     this->incomingEventsMutex_ = new boost::mutex;
     this->outgoingEventsMutex_ = new boost::mutex;
-    this->overallMutex_ = new boost::mutex;
+//     this->overallMutex_ = new boost::mutex;
   }
 
@@ -80 +80 @@
   void Connection::disconnectPeer(uint32_t peerID)
   {
-    this->overallMutex_->lock();
+//     this->overallMutex_->lock();
     outgoingEvent outEvent = { peerID, outgoingEventType::disconnectPeer, 0, 0 };
     
@@ -86 +86 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
-    this->overallMutex_->unlock();
+//     this->overallMutex_->unlock();
   }
   
@@ -100 +100 @@
   void Connection::addPacket(ENetPacket* packet, uint32_t peerID, uint8_t channelID)
   {
-    this->overallMutex_->lock();
+//     this->overallMutex_->lock();
     outgoingEvent outEvent = { peerID, outgoingEventType::sendPacket, packet, channelID };
     
@@ -106 +106 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
-    this->overallMutex_->unlock();
+//     this->overallMutex_->unlock();
   }
   
   void Connection::broadcastPacket(ENetPacket* packet, uint8_t channelID)
   {
-    this->overallMutex_->lock();
+//     this->overallMutex_->lock();
     outgoingEvent outEvent = { 0, outgoingEventType::broadcastPacket, packet, channelID };
     
@@ -117 +117 @@
     this->outgoingEvents_.push_back(outEvent);
     this->outgoingEventsMutex_->unlock();
-    this->overallMutex_->unlock();
+//     this->overallMutex_->unlock();
   }
 
@@ -125 +125 @@
     ENetEvent event;
     
-    this->overallMutex_->lock();
+//     this->overallMutex_->lock();
     while( bCommunicationThreadRunning_ )
     {
@@ -134 +134 @@
       }
       
-      this->overallMutex_->unlock();
+//       this->overallMutex_->unlock();
       msleep(10);
-      this->overallMutex_->lock();
+//       this->overallMutex_->lock();
       
       // Send all waiting outgoing packets
@@ -163 +163 @@
       }
     }
-    this->overallMutex_->unlock();
+//     this->overallMutex_->unlock();
   }
   

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

@@ -45 +45 @@
   {
     this->bindAddress_ = new ENetAddress();
-    memset(this->bindAddress_, 0, sizeof(ENetAddress));
+//     memset(this->bindAddress_, 0, sizeof(ENetAddress));
     this->bindAddress_->host = ENET_HOST_ANY;
     this->bindAddress_->port = NETWORK_PORT;
+    this->bindAddress_->scopeID = 0;
   }
 

code/branches/network6/src/libraries/network/packet/Gamestate.cc

@@ -158 +158 @@
   //start write gamestate header
   header_.setDataSize( currentsize );
+  header_.setCompSize( 0 );
   header_.setID( id );
   header_.setBaseID( GAMESTATEID_INITIAL );