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

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

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

trunk/src/lib/network/connection_monitor.cc

@@ -130 +130 @@
 
 /**
+ * remove old packets
+ * @param packetHistory 
+ * @param tick 
+ */
+void ConnectionMonitor::removeOldPackets( std::map< int, int > & packetHistory, int tick )
+{
+  while ( packetHistory.begin()->first < tick - MSECS_TO_CALC_BWIDTH )
+    packetHistory.erase( packetHistory.begin() );
+}
+
+/**
  * calculate bandwidth out of packethistory
  * @param packetHistory packet history
@@ -135 +146 @@
  * @return bandwidth in bytes/sec
  */
-float ConnectionMonitor::calculateBandWidth( std::map< int, int > packetHistory, int tick )
-{
-  // delete old packets
-  while ( packetHistory.begin()->first < tick - MSECS_TO_CALC_BWIDTH )
-    packetHistory.erase( packetHistory.begin() );
+float ConnectionMonitor::calculateBandWidth( std::map< int, int > & packetHistory, int tick )
+{
+  removeOldPackets( packetHistory, tick );
   
   float res = 0.0f;
-  
+#if 0
   for ( std::map<int,int>::iterator it = packetHistory.begin(); it != packetHistory.end(); it++ )
   {
@@ -155 +164 @@
   
   res *= 1000.0f;
-  
+#endif
+
+  for ( std::map<int,int>::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;
+
   return res;
 }