moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-15 22:05:07 -05:00
Code Issues Releases Wiki Activity

Improve timeout calculation

Browse Source 
gf
This commit is contained in:
sapier 2014-07-12 15:58:08 +02:00
parent 944ffe9e53
commit 247a1ebf23
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/connection.cpp
View File

@ -1410,6 +1410,7 @@ void ConnectionSendThread::runTimeouts(float dtime)
(m_max_data_packets_per_iteration/numpeers)); (m_max_data_packets_per_iteration/numpeers));
channel->UpdatePacketLossCounter(timed_outs.size()); channel->UpdatePacketLossCounter(timed_outs.size());
g_profiler->graphAdd("packets_lost", timed_outs.size());
m_iteration_packets_avaialble -= 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])); u16 seqnum = readU16(&(k->data[BASE_HEADER_SIZE+1]));
channel->UpdateBytesLost(k->data.getSize()); channel->UpdateBytesLost(k->data.getSize());
k->resend_count++;
LOG(derr_con<<m_connection->getDesc() LOG(derr_con<<m_connection->getDesc()
<<"RE-SENDING timed-out RELIABLE to " <<"RE-SENDING timed-out RELIABLE to "
@ -2349,24 +2351,30 @@ SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
try{ try{
BufferedPacket p = BufferedPacket p =
channel->outgoing_reliables_sent.popSeqnum(seqnum); channel->outgoing_reliables_sent.popSeqnum(seqnum);
// Get round trip time
unsigned int current_time = porting::getTimeMs();
if (current_time > p.absolute_send_time) // only calculate rtt from straight sent packets
{ if (p.resend_count == 0) {
float rtt = (current_time - p.absolute_send_time) / 1000.0; // Get round trip time
unsigned int current_time = porting::getTimeMs();
// Let peer calculate stuff according to it // a overflow is quite unlikely but as it'd result in major
// (avg_rtt and resend_timeout) // rtt miscalculation we handle it here
dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); if (current_time > p.absolute_send_time)
} {
else if (p.totaltime > 0) float rtt = (current_time - p.absolute_send_time) / 1000.0;
{
float rtt = p.totaltime;
// Let peer calculate stuff according to it // Let peer calculate stuff according to it
// (avg_rtt and resend_timeout) // (avg_rtt and resend_timeout)
dynamic_cast<UDPPeer*>(&peer)->reportRTT(rtt); 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 //put bytes for max bandwidth calculation
channel->UpdateBytesSent(p.data.getSize(),1); 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 // we already have this packet so this one was on wire at least
// the current timeout // 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"); throw ProcessedSilentlyException("Retransmitting ack for old packet");
} }

7
src/connection.h
View File

@ -162,16 +162,19 @@ inline bool seqnum_in_window(u16 seqnum, u16 next,u16 window_size)
struct BufferedPacket struct BufferedPacket
{ {
BufferedPacket(u8 *a_data, u32 a_size): 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): 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 SharedBuffer<u8> data; // Data of the packet, including headers
float time; // Seconds from buffering the packet or re-sending float time; // Seconds from buffering the packet or re-sending
float totaltime; // Seconds from buffering the packet float totaltime; // Seconds from buffering the packet
unsigned int absolute_send_time; unsigned int absolute_send_time;
Address address; // Sender or destination Address address; // Sender or destination
unsigned int resend_count;
}; };
// This adds the base headers to the data and makes a packet out of it // This adds the base headers to the data and makes a packet out of it

2
src/constants.h
View File

@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define CONNECTION_TIMEOUT 30 #define CONNECTION_TIMEOUT 30
#define RESEND_TIMEOUT_MIN 0.333 #define RESEND_TIMEOUT_MIN 0.1
#define RESEND_TIMEOUT_MAX 3.0 #define RESEND_TIMEOUT_MAX 3.0
// resend_timeout = avg_rtt * this // resend_timeout = avg_rtt * this
#define RESEND_TIMEOUT_FACTOR 4 #define RESEND_TIMEOUT_FACTOR 4