oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Revert RTT fixes (#8187)

Browse source 
The reverted commit 968ce9af59
is suspected (through the use of bisection) of causing network slowdowns.
Revert for now as we are close to release.
This commit is contained in:
ANAND 2019-02-16 05:09:22 +05:30 • committed by Paramat
parent 2153163cbd
commit 7a0e52acd6
5 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client/client.cpp
View file

@ -459,7 +459,7 @@ void Client::step(float dtime)
counter = 0.0;
// connectedAndInitialized() is true, peer exists.
float avg_rtt = getRTT();
infostream << "Client: average rtt: " << avg_rtt << std::endl;
infostream << "Client: avg_rtt=" << avg_rtt << std::endl;
}
/*
@ -1716,17 +1716,9 @@ void Client::afterContentReceived()
delete[] text;
}
// returns the Round Trip Time
// if the RTT did not become updated within 2 seconds, e.g. before timing out,
// it returns the expired time instead
float Client::getRTT()
{
float avg_rtt = m_con->getPeerStat(PEER_ID_SERVER, con::AVG_RTT);
float time_from_last_rtt =
m_con->getPeerStat(PEER_ID_SERVER, con::TIMEOUT_COUNTER);
if (avg_rtt + 2.0f > time_from_last_rtt)
return avg_rtt;
return time_from_last_rtt;
return m_con->getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
}
float Client::getCurRate()