Changeset 7974 in orxonox.OLD for branches/network/src/lib/network/connection_monitor.cc

Timestamp:

May 30, 2006, 11:44:48 AM (19 years ago)

Author:

rennerc

Message:

network traffic is measured correctly now
added PlayerStats class

File:

• branches/network/src/lib/network/connection_monitor.cc (modified) (5 diffs)

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

@@ -61 +61 @@
  * @param stateId packet's state id
  */
-void ConnectionMonitor::processUnzippedOutgoingPacket( byte * data, int length, int stateId )
-{
-  int tick = SDL_GetTicks();
-  
+void ConnectionMonitor::processUnzippedOutgoingPacket( int tick, byte * data, int length, int stateId )
+{
   nOutgoingPackets++;
   
@@ -93 +91 @@
  * @param ackedState state which was acked by this packet
  */
-void ConnectionMonitor::processUnzippedIncomingPacket( byte * data, int length, int stateId, int ackedState )
-{
-  int tick = SDL_GetTicks();
-  
+void ConnectionMonitor::processUnzippedIncomingPacket( int tick, byte * data, int length, int stateId, int ackedState )
+{
   nIncomingPackets++;
   
@@ -169 +165 @@
  * @param stateId packet's state id
  */
-void ConnectionMonitor::processZippedOutgoingPacket( byte * data, int length, int stateId )
-{
-  int tick = SDL_GetTicks();
-  
+void ConnectionMonitor::processZippedOutgoingPacket( int tick, byte * data, int length, int stateId )
+{
   nZOutgoingPackets++;
   
@@ -196 +190 @@
  * @param ackedState state which was acked by this packet
  */
-void ConnectionMonitor::processZippedIncomingPacket( byte * data, int length, int stateId, int ackedState )
-{
-  int tick = SDL_GetTicks();
-  
+void ConnectionMonitor::processZippedIncomingPacket( int tick, byte * data, int length )
+{
   nZIncomingPackets++;
   
@@ -233 +225 @@
 void ConnectionMonitor::printStatis( )
 {
-  NETPRINT(n)("=========NETWORKSTATS FOR USER %d=========\n", userId);
-  NETPRINT(n)("PING = %d\n", ping);
+  NETPRINT(n)("============NETWORKSTATS FOR USER %d============\n", userId);
+  NETPRINT(n)("PING = %d\n", ping );
   NETPRINT(n)("BANDWIDTH: UP: %f (%f) DOWN %f (%f)\n", outgoingZippedBandWidth, outgoingUnzippedBandWidth, incomingZippedBandWidth, incomingUnzippedBandWidth);
-  NETPRINT(n)("==========================================");
-}
-
-
+  NETPRINT(n)("PACKETS: RECIEVED %d; SENT %d\n", nIncomingPackets, nOutgoingPackets );
+  NETPRINT(n)("================================================\n");
+}
+
+