Changeset 5720 in orxonox.OLD

Timestamp:

Nov 23, 2005, 1:19:49 PM (18 years ago)

Author:

snellen

Message:

connection monitor updated

Location:

branches/network/src/lib/network

Files:

• connection_monitor.cc (modified) (5 diffs)
• connection_monitor.h (modified) (1 diff)

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

@@ -32 +32 @@
   /*Data of the lifetime of the ConnectionMonitor Object*/
   packetToAverage = 5;
+  protocollType = "default";
 
   startTime= SDL_GetTicks();
@@ -71 +72 @@
   currentDelay = currentPacketTick - lastPacketTick;
 
-  /*  Only for Udp
-      if(currentPacketID - lastPacketID > 1)
-      {
-              totalLostPackets += currentPacketID - lastPacketID;
-      }
-
-     totalPacketloss = (totalLostPackets/totalReceivedPackets)*100 ;
-  */
-
   /*Do whats needed for Averaging*/
 
   if(packetCounter = packetToAverage)
     {
-      computeAverageStatistic();
+      computeCurrentDatarate();
       displayStatistic();
       packetCounter = 0;
+      sizeOfLastFewPackets = 0;
     }
 
@@ -92 +85 @@
   lastFewPackets[packetCounter] = currentPacket;
   sizeOfLastFewPackets += packetLength;
+
+  /*  Do protocol related stuff
+
+  Only for Udp:
+  "currentPacketID = getID from package";
+
+  if(currentPacketID - lastPacketID > 1)
+  {
+  totalLostPackets += currentPacketID - lastPacketID;
+}
+
+  totalPacketloss = (totalLostPackets/totalReceivedPackets)*100 ;
+  */
 
 
@@ -105 +111 @@
 
 /* Compute the value of current Datarate*/
-void ConnectionMonitor::computeAverageStatistic()
+void ConnectionMonitor::computeCurrentDatarate()
 {
   int timeForLastFewPackets;
-  for(int i=0;i <= packetToAverage-1;i++)
+  for(int i=0;i < packetToAverage;i++)
     timeForLastFewPackets += lastFewDelays[i];
 
-  currentDatarate = packetToAverage/timeForLastFewPackets;
+  currentDatarate = sizeOfLastFewPackets/timeForLastFewPackets;
+}
+
+void doUDPRelatedStuff()
+{
+
 }
 
 
+
+/* Display connectoin statistic*/
 void ConnectionMonitor::displayStatistic()
 {
@@ -125 +138 @@
 
   PRINT(0)("Current datarate :\n",currentDatarate);
-  PRINT(0)("Delays of the last few packets :\n",currentDelay);
+  PRINT(0)("Delays of the last few packets :\n");
   for(int i=1 ;i <= packetToAverage-1;i++)
     PRINT(0)("%i ",lastFewDelays[i]);

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

@@ -23 +23 @@
 
     void                displayStatistic();
-    void                computeAverageStatistic();
+    void                computeCurrentDatarate();
+    void                doUDPRelatedStuff();
 
     /*Data of the lifetime of the ConnectionMonitor Object*/
     unsigned int        packetToAverage;
+    char*               protocollType;
 
     unsigned int        totalReceivedPackets;