Changeset 5800 in orxonox.OLD for branches/network/src/lib
- Timestamp:
- Nov 27, 2005, 7:05:34 PM (19 years ago)
- Location:
- branches/network/src/lib/network
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/network/connection_monitor.cc
r5798 r5800 88 88 /*Update the lifetime Variables*/ 89 89 totalReceivedPackets ++; 90 averageDatarate = totalReceivedPackets/(currentPacketTick - startTime); 90 float timeDiff = this->currentPacketTick - this->startTime; 91 if( timeDiff != 0.0f ) 92 averageDatarate = totalReceivedPackets/timeDiff; 91 93 92 94 /*Preparefor the next Packet*/ … … 134 136 // PRINT(0)("Total lost packets:",totalLostPackets); 135 137 // PRINT(0)("Packetloss [%] :\n",totalPacketloss); 136 // 138 // 137 139 // PRINT(0)("Current datarate :\n",currentDatarate); 138 140 // PRINT(0)("Delays of the last few packets :\n"); 139 141 // for(int i=1 ;i <= packetToAverage-1;i++) 140 142 // PRINT(0)("%i ",lastFewDelays[i]); 141 // 143 // 142 144 // PRINT(0)("============================================\n"); 143 145 -
branches/network/src/lib/network/network_stream.cc
r5798 r5800 11 11 ### File Specific: 12 12 main-programmer: claudio 13 co-programmer: 13 co-programmer: 14 14 */ 15 15 … … 39 39 40 40 41 NetworkStream::NetworkStream() 41 NetworkStream::NetworkStream() 42 42 : DataStream() 43 43 { … … 51 51 52 52 53 NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type) 53 NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type) 54 54 : DataStream() 55 55 { … … 63 63 64 64 65 NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type) 65 NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type) 66 66 : DataStream() 67 67 { … … 95 95 { 96 96 97 97 98 98 int ret = 0; 99 99 100 100 /* DOWNSTREAM */ 101 101 102 PRINT(0)("\n\n"); 103 PRINT(0)("============= DOWNSTREAM:===============\n"); 102 104 /* first of all read the synchronizeable's data: */ 103 105 ret = this->synchronizeables->readBytes((byte*)downBuffer); 104 106 105 107 /* send the received data to connectionMonitor */ 106 108 this->connectionMonitor->processPacket((byte*)downBuffer, ret + sizeof(Header)); … … 108 110 this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE, 109 111 *(this->synchronizeables), 12); 110 112 111 113 /* pass the data to the network socket */ 112 114 ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE + sizeof(Header)); 113 115 /* check if there was an error */ 114 116 if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");} 115 117 116 118 117 119 118 120 /* UPSTREAM */ 119 120 ret = 0;121 121 122 ret = 0; 123 PRINT(0)("============== UPSTREAM:================\n"); 122 124 /* first of all read data from networkSocket*/ 123 125 ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header)); … … 130 132 /* extract Header */ 131 133 this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE + sizeof(Header)); 132 134 133 135 /* now pass the data to the sync object */ 134 this->synchronizeables->writeBytes((byte*)upBuffer, PACKAGE_SIZE);136 this->synchronizeables->writeBytes((byte*)upBuffer, ret); 135 137 136 138 }
Note: See TracChangeset
for help on using the changeset viewer.