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

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:

• connection_monitor.cc (modified) (2 diffs)
• network_stream.cc (modified) (7 diffs)

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

@@ -88 +88 @@
   /*Update the lifetime Variables*/
   totalReceivedPackets ++;
-  averageDatarate = totalReceivedPackets/(currentPacketTick - startTime);
+  float timeDiff = this->currentPacketTick - this->startTime;
+  if( timeDiff != 0.0f )
+    averageDatarate = totalReceivedPackets/timeDiff;
 
   /*Preparefor the next Packet*/
@@ -134 +136 @@
 //   PRINT(0)("Total lost packets:",totalLostPackets);
 //   PRINT(0)("Packetloss [%] :\n",totalPacketloss);
-// 
+//
 //   PRINT(0)("Current datarate :\n",currentDatarate);
 //   PRINT(0)("Delays of the last few packets :\n");
 //   for(int i=1 ;i <= packetToAverage-1;i++)
 //     PRINT(0)("%i ",lastFewDelays[i]);
-// 
+//
 //   PRINT(0)("============================================\n");
 

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

@@ -11 +11 @@
 ### File Specific:
    main-programmer: claudio
-   co-programmer: 
+   co-programmer:
 */
 
@@ -39 +39 @@
 
 
-NetworkStream::NetworkStream() 
+NetworkStream::NetworkStream()
   : DataStream()
 {
@@ -51 +51 @@
 
 
-NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type) 
+NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type)
   : DataStream()
 {
@@ -63 +63 @@
 
 
-NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type) 
+NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type)
   : DataStream()
 {
@@ -95 +95 @@
 {
 
- 
+
   int ret = 0;
 
   /* DOWNSTREAM */
 
+  PRINT(0)("\n\n");
+  PRINT(0)("============= DOWNSTREAM:===============\n");
   /* first of all read the synchronizeable's data: */
   ret = this->synchronizeables->readBytes((byte*)downBuffer);
-  
+
   /* send the received data to connectionMonitor */
   this->connectionMonitor->processPacket((byte*)downBuffer, ret + sizeof(Header));
@@ -108 +110 @@
   this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE,
                                        *(this->synchronizeables), 12);
-        
+
   /* pass the data to the network socket */
   ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE + sizeof(Header));
   /* check if there was an error */
   if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
-  
+
 
 
   /* UPSTREAM */
-  
-  ret = 0; 
 
+  ret = 0;
+  PRINT(0)("============== UPSTREAM:================\n");
   /* first of all read  data from networkSocket*/
   ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
@@ -130 +132 @@
   /* extract Header */
   this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE + sizeof(Header));
-    
+
   /* now pass the data to the sync object */
-  this->synchronizeables->writeBytes((byte*)upBuffer, PACKAGE_SIZE);
+  this->synchronizeables->writeBytes((byte*)upBuffer, ret);
 
 }