Changeset 7851 in orxonox.OLD for branches

Timestamp:

May 25, 2006, 1:27:00 PM (19 years ago)

Author:

rennerc

Message:

compression implemented

Location:

branches/network/src

Files:

• lib/network/Makefile.am (modified) (2 diffs)
• lib/network/connection_monitor.cc (modified) (4 diffs)
• lib/network/connection_monitor.h (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (9 diffs)
• lib/network/network_stream.h (modified) (3 diffs)
• lib/network/zip.cc (added)
• lib/network/zip.h (added)
• orxonox.cc (modified) (1 diff)

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

@@ -22 +22 @@
                       message_manager.cc \
                       network_log.cc \
+                      zip.cc \
                       \
                       synchronizeable_var/synchronizeable_var.cc \
@@ -54 +55 @@
                  message_manager.h \
                  network_log.h \
+                 zip.h \
                  \
                  synchronizeable_var/synchronizeable_var.h \

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

@@ -33 +33 @@
   this->incomingUnzippedBandWidth = 0;
   this->outgoingUnzippedBandWidth = 0;
+  this->incomingZippedBandWidth = 0;
+  this->outgoingZippedBandWidth = 0;
   this->nIncomingPackets = 0;
   this->nOutgoingPackets = 0;
+  this->nZIncomingPackets = 0;
+  this->nZOutgoingPackets = 0;
   
   this->lastPacketTick = 0;
@@ -56 +60 @@
   outgoingUnzippedBandWidth = calculateBandWidth( outgoingUnzippedPacketHistory, tick );
   
-  NETPRINTF(n)("UPSTREAM: user: %d bandwidth %f\n", userId, outgoingUnzippedBandWidth );
+  NETPRINTF(n)("UNZIPPED UPSTREAM: user: %d bandwidth %f\n", userId, outgoingUnzippedBandWidth );
   
   // count zero bytes
@@ -104 +108 @@
   incomingUnzippedBandWidth = calculateBandWidth( incomingUnzippedPacketHistory, tick );
   
-  NETPRINTF(n)("DOWNSTREAM: user: %d bandwidth %f\n", userId, incomingUnzippedBandWidth );
+  NETPRINTF(n)("UNZIPPED DOWNSTREAM: user: %d bandwidth %f\n", userId, incomingUnzippedBandWidth );
   
 }
@@ -132 +136 @@
 
 
+
+
+void ConnectionMonitor::processZippedOutgoingPacket( byte * data, int length, int stateId )
+{
+  int tick = SDL_GetTicks();
+  
+  nZOutgoingPackets++;
+  
+  // calculate bandwidth
+  outgoingZippedPacketHistory[tick] = length;
+  outgoingZippedBandWidth = calculateBandWidth( outgoingZippedPacketHistory, tick );
+  
+  NETPRINTF(n)("UPSTREAM: user: %d bandwidth %f\n", userId, outgoingZippedBandWidth );
+
+}
+
+
+void ConnectionMonitor::processZippedIncomingPacket( byte * data, int length, int stateId, int ackedState )
+{
+  int tick = SDL_GetTicks();
+  
+  nZIncomingPackets++;
+  
+  // calculate bandwidth
+  incomingZippedPacketHistory[tick] = length;
+  incomingZippedBandWidth = calculateBandWidth( incomingZippedPacketHistory, tick );
+  
+  NETPRINTF(n)("DOWNSTREAM: user: %d bandwidth %f\n", userId, incomingZippedBandWidth );
+  
+}
+

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

@@ -24 +24 @@
     void processUnzippedOutgoingPacket( byte * data, int length, int stateId );
     void processUnzippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
-    void processZippedPacket(  );
+    
+    void processZippedOutgoingPacket( byte * data, int length, int stateId );
+    void processZippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
     
     void calculatePing();
@@ -40 +42 @@
     std::map<int,int>   outgoingUnzippedPacketHistory;
     
+    std::map<int,int>   incomingZippedPacketHistory;
+    std::map<int,int>   outgoingZippedPacketHistory;
+    
     std::list<int>      ackDelay;
     int                 ping;
@@ -46 +51 @@
     float               outgoingUnzippedBandWidth;
     
+    float               incomingZippedBandWidth;
+    float               outgoingZippedBandWidth;
+    
     int                 nIncomingPackets;
     int                 nOutgoingPackets;
+    
+    int                 nZIncomingPackets;
+    int                 nZOutgoingPackets;
     
     int                 lastPacketTick;

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

@@ -30 +30 @@
 #include "shared_network_data.h"
 #include "message_manager.h"
+#include "preferences.h"
+#include "zip.h"
+
+#include "src/lib/util/loading/resource_manager.h"
 
 #include "network_log.h"
@@ -88 +92 @@
   myHostId = 0;
   currentState = 0;
+  
+  remainingBytesToWriteToDict = Preferences::getInstance()->getInt( "compression", "writedict", 0 );
+  
+  assert( Zip::getInstance()->loadDictionary( "testdict" ) );
 }
 
@@ -365 +373 @@
 void NetworkStream::handleUpstream( )
 {
-  byte buf[UDP_PACKET_SIZE];
   int offset;
   int n;
@@ -430 +437 @@
     assert( Converter::intToByteArray( offset, buf, INTSIZE ) == INTSIZE );
     
-    assert( peer->second.socket->writePacket( buf, offset ) );
+    int compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE );
+    
+    if ( compLength < 0 )
+    {
+      PRINTF(1)("compression failed!\n");
+      continue;
+    }
+    
+    assert( peer->second.socket->writePacket( compBuf, compLength ) );
+    
+    if ( this->remainingBytesToWriteToDict > 0 )
+      writeToNewDict( buf, offset );
     
     peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
+    peer->second.connectionMonitor->processZippedOutgoingPacket( compBuf, compLength, currentState );
     
     NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
@@ -443 +462 @@
 void NetworkStream::handleDownstream( )
 {
-  byte buf[UDP_PACKET_SIZE];
   int offset = 0;
   
   int length = 0;
   int packetLength = 0;
+  int compLength = 0;
   int uniqueId = 0;
   int state = 0;
@@ -460 +479 @@
       continue;
 
-    while ( 0 < (packetLength = peer->second.socket->readPacket( buf, UDP_PACKET_SIZE )) )
-    {
+    while ( 0 < (compLength = peer->second.socket->readPacket( compBuf, UDP_PACKET_SIZE )) )
+    {
+      packetLength = Zip::getInstance()->unZip( compBuf, compLength, buf, UDP_PACKET_SIZE );
+      
       if ( packetLength < 4*INTSIZE )
       {
@@ -468 +489 @@
         continue;
       }
+      
+      if ( this->remainingBytesToWriteToDict > 0 )
+        writeToNewDict( buf, packetLength );
     
       assert( Converter::byteArrayToInt( buf, &length ) == INTSIZE );
@@ -586 +610 @@
       }
       
+      peer->second.connectionMonitor->processZippedIncomingPacket( compBuf, compLength, currentState, ackedState );
       peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, currentState, ackedState );
     
@@ -629 +654 @@
 }
 
-
-
-
-
-
+/**
+ * writes data to DATA/dicts/newdict
+ * @param data pointer to data
+ * @param length length
+ */
+void NetworkStream::writeToNewDict( byte * data, int length )
+{
+  if ( remainingBytesToWriteToDict <= 0 )
+    return;
+  
+  if ( length > remainingBytesToWriteToDict )
+    length = remainingBytesToWriteToDict;
+  
+  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  fileName += "/dicts/newdict";
+  
+  FILE * f = fopen( fileName.c_str(), "a" );
+  
+  if ( !f )
+  {
+    PRINTF(2)("could not open %s\n", fileName.c_str());
+    remainingBytesToWriteToDict = 0;
+    return;
+  }
+  
+  if ( fwrite( data, 1, length, f ) != length )
+  {
+    PRINTF(2)("could not write to file\n");
+    fclose( f );
+    return;
+  }
+  
+  fclose( f );
+  
+  remainingBytesToWriteToDict -= length;  
+}
+
+
+
+
+
+

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

@@ -15 +15 @@
 #include "handshake.h"
 #include "connection_monitor.h"
+#include "udp_server_socket.h"
 
 class Synchronizeable;
@@ -82 +83 @@
     void handleNewClient( int userId );
     void cleanUpOldSyncList();
+    
+    void writeToNewDict( byte * data, int length );
 
 
@@ -94 +97 @@
     int                        myHostId;
     
-    int                        currentState;
+    int                        currentState;                //!< current state id
 
     NetworkGameManager*        networkGameManager;
 
-    std::map<int,int>          oldSynchronizeables;
+    std::map<int,int>          oldSynchronizeables;         //!< used to save recently deleted sync ids to not recreate them
+    
+    byte                       buf[UDP_PACKET_SIZE];        //!< used by handleUp/Downstream
+    byte                       compBuf[UDP_PACKET_SIZE];    //!< used by handleUp/Downstream
+
+    int                        remainingBytesToWriteToDict; //!< if > 0 NetworkStream will write packets to DATA/dicts/newdict
 };
 #endif /* _NETWORK_STREAM */

branches/network/src/orxonox.cc

@@ -86 +86 @@
 
 REGISTER_ARG_ARG(  t, telnetport,  "network","telnetport",        "Port to use for network debug output",               "port" );
+REGISTER_ARG_ARG(  _, write_dict,  "compression", "writedict",    "write packets to DATA/dicts/newdict",               "numBytes" );
 
 /**