Changeset 9494 in orxonox.OLD for trunk/src/lib/network/monitor/connection_monitor.cc

Timestamp:

Jul 27, 2006, 10:44:28 AM (18 years ago)

Author:

bensch

Message:

merged the proxy back

File:

• trunk/src/lib/network/monitor/connection_monitor.cc (modified) (11 diffs)

trunk/src/lib/network/monitor/connection_monitor.cc

@@ -32 +32 @@
   /* set the class id for the base object and add ist to class list*/
   this->setClassID(CL_CONNECTION_MONITOR, "ConnectionMonitor");
-  
+
   this->userId = userId;
   this->ping = 0;
@@ -43 +43 @@
   this->nZIncomingPackets = 0;
   this->nZOutgoingPackets = 0;
-  
+
   this->lastPacketTick = 0;
   this->lastPrintTick = 0;
@@ -64 +64 @@
 {
   nOutgoingPackets++;
-  
+
   // for ping calculation
   sentStateTicks[stateId] = tick;
-  
+
   // calculate bandwidth
   outgoingUnzippedPacketHistory[tick] = length;
   outgoingUnzippedBandWidth = calculateBandWidth( outgoingUnzippedPacketHistory, tick );
-  
+
   //NETPRINTF(n)("UNZIPPED UPSTREAM: user: %d bandwidth %f\n", userId, outgoingUnzippedBandWidth );
-  
+
   // count zero bytes
   //int nZeroBytes = 0;
-  
+
   //for ( int i = 0; i < length; i++ )
   //  if ( data[i] == '\0' )
   //    nZeroBytes++;
-  
+
   //NETPRINTF(n)( "ZEROBYTES: %d (%f%%)\n", nZeroBytes, ((float)100)*nZeroBytes/length );
 }
@@ -94 +94 @@
 {
   nIncomingPackets++;
-  
+
   lastPacketTick = tick;
-  
+
   // calculate ping
   if ( sentStateTicks.find( ackedState ) != sentStateTicks.end() )
@@ -102 +102 @@
     ackDelay.push_back( tick - sentStateTicks[ackedState] );
   }
-  
+
   while ( sentStateTicks.begin() != sentStateTicks.end() && sentStateTicks.begin()->first <= ackedState )
     sentStateTicks.erase( sentStateTicks.begin() );
-      
+
   while ( ackDelay.size() > N_PACKETS_FOR_PING )
     ackDelay.erase( ackDelay.begin() );
-      
+
   ping = 0;
-      
+
   for ( std::list<int>::iterator it = ackDelay.begin(); it != ackDelay.end(); it++ )
     ping += *it;
-      
+
   if ( ackDelay.size() == 0 )
     ping = -1;
   else
     ping /= ackDelay.size();
-      
+
   //NETPRINTF(n)("PING: user: %d ping: %d\n", userId, ping );
-  
+
   // calculate bandwidth
   incomingUnzippedPacketHistory[tick] = length;
   incomingUnzippedBandWidth = calculateBandWidth( incomingUnzippedPacketHistory, tick );
-  
+
   //NETPRINTF(n)("UNZIPPED DOWNSTREAM: user: %d bandwidth %f\n", userId, incomingUnzippedBandWidth );
-  
+
 }
 
 /**
  * remove old packets
- * @param packetHistory 
- * @param tick 
+ * @param packetHistory
+ * @param tick
  */
 void ConnectionMonitor::removeOldPackets( std::map< int, int > & packetHistory, int tick )
@@ -149 +149 @@
 {
   removeOldPackets( packetHistory, tick );
-  
+
   float res = 0.0f;
 #if 0
@@ -157 +157 @@
       res += it->second;
   }
-  
+
   if ( packetHistory.size() <= 1 || tick - packetHistory.begin()->first == 0 )
     res = 0.0f;
   else
     res /= (float)(tick - packetHistory.begin()->first);
-  
+
   res *= 1000.0f;
 #endif
 
-  for ( std::map<int,int>::iterator it = packetHistory.begin(); it != packetHistory.end(); it++ )
+  for ( std::map<int,int>::const_iterator it = packetHistory.begin(); it != packetHistory.end(); it++ )
   {
     res += it->second;
   }
-  
+
   if ( packetHistory.size() <= 1 )
     res = 0.0f;
   else
     res /= (float)(tick - packetHistory.begin()->first);
-  
+
   res *= 1000.0f;
 
@@ -191 +191 @@
 {
   nZOutgoingPackets++;
-  
+
   // calculate bandwidth
   outgoingZippedPacketHistory[tick] = length;
   outgoingZippedBandWidth = calculateBandWidth( outgoingZippedPacketHistory, tick );
-  
+
   //NETPRINTF(n)("UPSTREAM: user: %d bandwidth %f nOutgoingPackets %d\n", userId, outgoingZippedBandWidth, nOutgoingPackets );
 
@@ -216 +216 @@
 {
   nZIncomingPackets++;
-  
+
   // calculate bandwidth
   incomingZippedPacketHistory[tick] = length;
   incomingZippedBandWidth = calculateBandWidth( incomingZippedPacketHistory, tick );
-  
+
   //NETPRINTF(n)("DOWNSTREAM: user: %d bandwidth %f nIncomingPackets %d\n", userId, incomingZippedBandWidth, nIncomingPackets );
-  
+
 }
 
@@ -230 +230 @@
  * @return true if last packet recieved \< NOW() - SECS_TO_TIMEOUT
  */
-bool ConnectionMonitor::hasTimedOut( )
+bool ConnectionMonitor::hasTimedOut( ) const
 {
   if ( lastPacketTick + SECS_TO_TIMEOUT*1000 < SDL_GetTicks() && nIncomingPackets > 0 )
     return true;
-  
+
   if ( nIncomingPackets == 0 && nOutgoingPackets >= NETWORK_FREQUENCY*SECS_TO_TIMEOUT )
     return true;
-  
+
   return false;
 }
@@ -246 +246 @@
  * prints bandwith usage, ping and other important things to telnet-console
  */
-void ConnectionMonitor::printStatis( )
+void ConnectionMonitor::printStatis( ) const
 {
   NETPRINT(n)("============NETWORKSTATS FOR USER %d============\n", userId);