Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5800 in orxonox.OLD for branches/network/src/lib


Ignore:
Timestamp:
Nov 27, 2005, 7:05:34 PM (19 years ago)
Author:
patrick
Message:

network: included more comments to make it easier to debug

Location:
branches/network/src/lib/network
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/network/connection_monitor.cc

    r5798 r5800  
    8888  /*Update the lifetime Variables*/
    8989  totalReceivedPackets ++;
    90   averageDatarate = totalReceivedPackets/(currentPacketTick - startTime);
     90  float timeDiff = this->currentPacketTick - this->startTime;
     91  if( timeDiff != 0.0f )
     92    averageDatarate = totalReceivedPackets/timeDiff;
    9193
    9294  /*Preparefor the next Packet*/
     
    134136//   PRINT(0)("Total lost packets:",totalLostPackets);
    135137//   PRINT(0)("Packetloss [%] :\n",totalPacketloss);
    136 // 
     138//
    137139//   PRINT(0)("Current datarate :\n",currentDatarate);
    138140//   PRINT(0)("Delays of the last few packets :\n");
    139141//   for(int i=1 ;i <= packetToAverage-1;i++)
    140142//     PRINT(0)("%i ",lastFewDelays[i]);
    141 // 
     143//
    142144//   PRINT(0)("============================================\n");
    143145
  • branches/network/src/lib/network/network_stream.cc

    r5798 r5800  
    1111### File Specific:
    1212   main-programmer: claudio
    13    co-programmer: 
     13   co-programmer:
    1414*/
    1515
     
    3939
    4040
    41 NetworkStream::NetworkStream() 
     41NetworkStream::NetworkStream()
    4242  : DataStream()
    4343{
     
    5151
    5252
    53 NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type) 
     53NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type)
    5454  : DataStream()
    5555{
     
    6363
    6464
    65 NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type) 
     65NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type)
    6666  : DataStream()
    6767{
     
    9595{
    9696
    97  
     97
    9898  int ret = 0;
    9999
    100100  /* DOWNSTREAM */
    101101
     102  PRINT(0)("\n\n");
     103  PRINT(0)("============= DOWNSTREAM:===============\n");
    102104  /* first of all read the synchronizeable's data: */
    103105  ret = this->synchronizeables->readBytes((byte*)downBuffer);
    104  
     106
    105107  /* send the received data to connectionMonitor */
    106108  this->connectionMonitor->processPacket((byte*)downBuffer, ret + sizeof(Header));
     
    108110  this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE,
    109111                                       *(this->synchronizeables), 12);
    110        
     112
    111113  /* pass the data to the network socket */
    112114  ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE + sizeof(Header));
    113115  /* check if there was an error */
    114116  if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
    115  
     117
    116118
    117119
    118120  /* UPSTREAM */
    119  
    120   ret = 0;
    121121
     122  ret = 0;
     123  PRINT(0)("============== UPSTREAM:================\n");
    122124  /* first of all read  data from networkSocket*/
    123125  ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
     
    130132  /* extract Header */
    131133  this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE + sizeof(Header));
    132    
     134
    133135  /* now pass the data to the sync object */
    134   this->synchronizeables->writeBytes((byte*)upBuffer, PACKAGE_SIZE);
     136  this->synchronizeables->writeBytes((byte*)upBuffer, ret);
    135137
    136138}
Note: See TracChangeset for help on using the changeset viewer.