Changeset 8505 in orxonox.OLD for branches/network/src

Timestamp:

Jun 15, 2006, 11:04:18 PM (18 years ago)

Author:

rennerc

Message:

simpler bandwidth computation

Location:

branches/network/src/lib/network

Files:

• connection_monitor.cc (modified) (2 diffs)
• network_stream.cc (modified) (1 diff)

branches/network/src/lib/network/connection_monitor.cc

@@ -151 +151 @@
   
   float res = 0.0f;
-  
+#if 0
   for ( std::map<int,int>::iterator it = packetHistory.begin(); it != packetHistory.end(); it++ )
   {
@@ -164 +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;
 }

branches/network/src/lib/network/network_stream.cc

@@ -514 +514 @@
       compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictClient );
     
-    if ( compLength < 0 )
+    if ( compLength <= 0 )
     {
       PRINTF(1)("compression failed!\n");