Changeset 8481 in orxonox.OLD

Timestamp:

Jun 15, 2006, 4:59:47 PM (18 years ago)

Author:

rennerc

Message:

ConnectionMonitor removes old packets correctly now

Location:

branches/network/src/lib/network

Files:

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

branches/network/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;

branches/network/src/lib/network/connection_monitor.h

@@ -35 +35 @@
     
   private:
-    float calculateBandWidth( std::map<int,int> packetHistory, int tick );
+    float calculateBandWidth( std::map<int,int> & packetHistory, int tick );
+    void removeOldPackets( std::map<int,int> & packetHistory, int tick );
     
     int userId;       //!< user's id 

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

@@ -517 +517 @@
       writeToNewDict( buf, offset );
     
-    //TODO use connectionMonitor
-    //peer->second.connectionMonitor->processUnzippedOutgoingPacket( tick, buf, offset, currentState );
-    //peer->second.connectionMonitor->processZippedOutgoingPacket( tick, compBuf, compLength, currentState );
+    peer->second.connectionMonitor->processUnzippedOutgoingPacket( tick, buf, offset, currentState );
+    peer->second.connectionMonitor->processZippedOutgoingPacket( tick, compBuf, compLength, currentState );
     
     //NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
@@ -549 +548 @@
     while ( 0 < (compLength = peer->second.socket->readPacket( compBuf, UDP_PACKET_SIZE )) )
     {
-      //TODO use networkMonitor
-      //peer->second.connectionMonitor->processZippedIncomingPacket( tick, compBuf, compLength );
+      peer->second.connectionMonitor->processZippedIncomingPacket( tick, compBuf, compLength );
       
       //PRINTF(0)("GGGGGOOOOOOOOOOTTTTTTTT: %d\n", compLength);
@@ -572 +570 @@
       offset = 4*INTSIZE;
       
-      //TODO use connectoinMonitor
-      //peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, offset, state, ackedState );
+      peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, offset, state, ackedState );
 
       //NETPRINTF(n)("got packet: %d, %d\n", length, packetLength);