Changeset 7974 in orxonox.OLD for branches/network

Timestamp:

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

Author:

rennerc

Message:

network traffic is measured correctly now
added PlayerStats class

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/network/Makefile.am (modified) (2 diffs)
• lib/network/connection_monitor.cc (modified) (5 diffs)
• lib/network/connection_monitor.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (8 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/player_stats.cc (added)
• lib/network/player_stats.h (added)
• lib/network/synchronizeable.h (modified) (1 diff)

branches/network/src/defs/class_id.h

@@ -367 +367 @@
   CL_NETWORK_GAME_MANAGER       =    0x00000d07,
   CL_MESSAGE_MANAGER            =    0x00000d08,
-  CL_SIMPLE_SYNC                =    0x00000d09,
+  CL_PLAYER_STATS               =    0x00000d09,
+  CL_SIMPLE_SYNC                =    0x00000d0a,
 
 

branches/network/src/lib/network/Makefile.am

@@ -23 +23 @@
                       network_log.cc \
                       zip.cc \
+                      player_stats.cc \
                       \
                       synchronizeable_var/synchronizeable_var.cc \
@@ -56 +57 @@
                  network_log.h \
                  zip.h \
+                 player_stats.h \
                  \
                  synchronizeable_var/synchronizeable_var.h \

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");
+}
+
+

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

@@ -22 +22 @@
     virtual ~ConnectionMonitor();
 
-    void processUnzippedOutgoingPacket( byte * data, int length, int stateId );
-    void processUnzippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
+    void processUnzippedOutgoingPacket( int tick, byte * data, int length, int stateId );
+    void processUnzippedIncomingPacket( int tick, byte * data, int length, int stateId, int ackedState );
     
-    void processZippedOutgoingPacket( byte * data, int length, int stateId );
-    void processZippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
+    void processZippedOutgoingPacket( int tick, byte * data, int length, int stateId );
+    void processZippedIncomingPacket( int tick, byte * data, int length );
     
     void calculatePing();

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

@@ -177 +177 @@
 void NetworkStream::processData()
 {
+  int tick = SDL_GetTicks();
+  
   currentState++;
   
@@ -207 +209 @@
   // order of up/downstream is important!!!!
   // don't change it
-  handleDownstream();
-  handleUpstream();
+  handleDownstream( tick );
+  handleUpstream( tick );
 
 }
@@ -391 +393 @@
  * handle upstream network traffic
  */
-void NetworkStream::handleUpstream( )
+void NetworkStream::handleUpstream( int tick )
 {
   int offset;
   int n;
   
-  for ( PeerList::iterator peer = peers.begin(); peer != peers.end(); peer++ )
+  for ( PeerList::reverse_iterator peer = peers.rbegin(); peer != peers.rend(); peer++ )
   {
     offset = INTSIZE; //make already space for length 
@@ -496 +498 @@
       writeToNewDict( buf, offset );
     
-    peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
-    peer->second.connectionMonitor->processZippedOutgoingPacket( 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);
@@ -506 +508 @@
  * handle downstream network traffic
  */
-void NetworkStream::handleDownstream( )
+void NetworkStream::handleDownstream( int tick )
 {
   int offset = 0;
@@ -527 +529 @@
     while ( 0 < (compLength = peer->second.socket->readPacket( compBuf, UDP_PACKET_SIZE )) )
     {
-      //TODO tell monitor about zipped packet. because dropped packets dont count to bandwidth
+      peer->second.connectionMonitor->processZippedIncomingPacket( tick, compBuf, compLength );
+      
       //PRINTF(0)("GGGGGOOOOOOOOOOTTTTTTTT: %d\n", compLength);
       packetLength = Zip::getInstance()->unZip( compBuf, compLength, buf, UDP_PACKET_SIZE );
@@ -547 +550 @@
       //NETPRINTF(n)("ackedstate: %d\n", ackedState);
       offset = 4*INTSIZE;
+      
+      peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, offset, state, ackedState );
 
       //NETPRINTF(n)("got packet: %d, %d\n", length, packetLength);
@@ -672 +677 @@
       }
       
-      peer->second.connectionMonitor->processZippedIncomingPacket( compBuf, compLength, state, ackedState );
-      peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, state, ackedState );
-    
       assert( peer->second.lastAckedState <= ackedState );
       peer->second.lastAckedState = ackedState;

branches/network/src/lib/network/network_stream.h

@@ -79 +79 @@
     void updateConnectionList();
     void handleHandshakes();
-    void handleUpstream();
-    void handleDownstream(); 
+    void handleUpstream( int tick );
+    void handleDownstream(int tick ); 
     void handleNewClient( int userId );
     void cleanUpOldSyncList();

branches/network/src/lib/network/synchronizeable.h

@@ -61 +61 @@
     virtual void handleSentState( int userId, int stateId, int fromStateId );
     virtual void handleRecvState( int userId, int stateId, int fromStateId );
-
+    
     void registerVar( SynchronizeableVar * var );
     int registerVarId( SynchronizeableVar * var );