diff options
| -rw-r--r-- | src/connection.cpp | 41 | ||||
| -rw-r--r-- | src/connection.h | 7 | ||||
| -rw-r--r-- | src/constants.h | 2 |
3 files changed, 31 insertions, 19 deletions
diff --git a/src/connection.cpp b/src/connection.cpp index cb1750271..2f9339e6a 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -1410,6 +1410,7 @@ void ConnectionSendThread::runTimeouts(float dtime) (m_max_data_packets_per_iteration/numpeers)); channel->UpdatePacketLossCounter(timed_outs.size()); + g_profiler->graphAdd("packets_lost", timed_outs.size()); m_iteration_packets_avaialble -= timed_outs.size(); @@ -1421,6 +1422,7 @@ void ConnectionSendThread::runTimeouts(float dtime) u16 seqnum = readU16(&(k->data[BASE_HEADER_SIZE+1])); channel->UpdateBytesLost(k->data.getSize()); + k->resend_count++; LOG(derr_con<<m_connection->getDesc() <<"RE-SENDING timed-out RELIABLE to " @@ -2349,24 +2351,30 @@ SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel, try{ BufferedPacket p = channel->outgoing_reliables_sent.popSeqnum(seqnum); - // Get round trip time - unsigned int current_time = porting::getTimeMs(); - if (current_time > p.absolute_send_time) - { - float rtt = (current_time - p.absolute_send_time) / 1000.0; + // only calculate rtt from straight sent packets + if (p.resend_count == 0) { + // Get round trip time + unsigned int current_time = porting::getTimeMs(); - // Let peer calculate stuff according to it - // (avg_rtt and resend_timeout) - dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); - } - else if (p.totaltime > 0) - { - float rtt = p.totaltime; + // a overflow is quite unlikely but as it'd result in major + // rtt miscalculation we handle it here + if (current_time > p.absolute_send_time) + { + float rtt = (current_time - p.absolute_send_time) / 1000.0; - // Let peer calculate stuff according to it - // (avg_rtt and resend_timeout) - dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); + // Let peer calculate stuff according to it + // (avg_rtt and resend_timeout) + dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); + } + else if (p.totaltime > 0) + { + float rtt = p.totaltime; + + // Let peer calculate stuff according to it + // (avg_rtt and resend_timeout) + dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); + } } //put bytes for max bandwidth calculation channel->UpdateBytesSent(p.data.getSize(),1); @@ -2542,7 +2550,8 @@ SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel, // we already have this packet so this one was on wire at least // the current timeout - dynamic_cast<UDPPeer*>(&peer)->reportRTT(dynamic_cast<UDPPeer*>(&peer)->getResendTimeout()); + // we don't know how long this packet was on wire don't do silly guessing + // dynamic_cast<UDPPeer*>(&peer)->reportRTT(dynamic_cast<UDPPeer*>(&peer)->getResendTimeout()); throw ProcessedSilentlyException("Retransmitting ack for old packet"); } diff --git a/src/connection.h b/src/connection.h index b025a4dfc..516702cb8 100644 --- a/src/connection.h +++ b/src/connection.h @@ -162,16 +162,19 @@ inline bool seqnum_in_window(u16 seqnum, u16 next,u16 window_size) struct BufferedPacket { BufferedPacket(u8 *a_data, u32 a_size): - data(a_data, a_size), time(0.0), totaltime(0.0), absolute_send_time(-1) + data(a_data, a_size), time(0.0), totaltime(0.0), absolute_send_time(-1), + resend_count(0) {} BufferedPacket(u32 a_size): - data(a_size), time(0.0), totaltime(0.0), absolute_send_time(-1) + data(a_size), time(0.0), totaltime(0.0), absolute_send_time(-1), + resend_count(0) {} SharedBuffer<u8> data; // Data of the packet, including headers float time; // Seconds from buffering the packet or re-sending float totaltime; // Seconds from buffering the packet unsigned int absolute_send_time; Address address; // Sender or destination + unsigned int resend_count; }; // This adds the base headers to the data and makes a packet out of it diff --git a/src/constants.h b/src/constants.h index 526e44159..f22a6e8af 100644 --- a/src/constants.h +++ b/src/constants.h @@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define CONNECTION_TIMEOUT 30 -#define RESEND_TIMEOUT_MIN 0.333 +#define RESEND_TIMEOUT_MIN 0.1 #define RESEND_TIMEOUT_MAX 3.0 // resend_timeout = avg_rtt * this #define RESEND_TIMEOUT_FACTOR 4 |