Skip to content
Permalink
Browse files

Revert RTT fixes (#8187)

The reverted commit 968ce9a
is suspected (through the use of bisection) of causing network slowdowns.
Revert for now as we are close to release.
  • Loading branch information...
ClobberXD authored and paramat committed Feb 15, 2019
1 parent 2153163 commit 7a0e52acd65e7097977c924f26b387ec3da9baac
Showing with 38 additions and 34 deletions.
  1. +2 −10 src/client/client.cpp
  2. +23 −12 src/network/connection.cpp
  3. +3 −3 src/network/connection.h
  4. +9 −7 src/network/connectionthreads.cpp
  5. +1 −2 src/network/peerhandler.h
@@ -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()
@@ -809,9 +809,8 @@ void Peer::DecUseCount()
delete this;
}

void Peer::RTTStatistics(float rtt, const std::string &profiler_id)
{
static const float avg_factor = 100.0f / MAX_RELIABLE_WINDOW_SIZE;
void Peer::RTTStatistics(float rtt, const std::string &profiler_id,
unsigned int num_samples) {

if (m_last_rtt > 0) {
/* set min max values */
@@ -822,24 +821,32 @@ void Peer::RTTStatistics(float rtt, const std::string &profiler_id)

/* do average calculation */
if (m_rtt.avg_rtt < 0.0)
m_rtt.avg_rtt = rtt;
m_rtt.avg_rtt = rtt;
else
m_rtt.avg_rtt += (rtt - m_rtt.avg_rtt) * avg_factor;
m_rtt.avg_rtt = m_rtt.avg_rtt * (num_samples/(num_samples-1)) +
rtt * (1/num_samples);

/* do jitter calculation */

//just use some neutral value at beginning
float jitter = std::fabs(rtt - m_last_rtt);
float jitter = m_rtt.jitter_min;

if (rtt > m_last_rtt)
jitter = rtt-m_last_rtt;

if (rtt <= m_last_rtt)
jitter = m_last_rtt - rtt;

if (jitter < m_rtt.jitter_min)
m_rtt.jitter_min = jitter;
if (jitter >= m_rtt.jitter_max)
m_rtt.jitter_max = jitter;

if (m_rtt.jitter_avg < 0.0)
m_rtt.jitter_avg = jitter;
m_rtt.jitter_avg = jitter;
else
m_rtt.jitter_avg += (jitter - m_rtt.jitter_avg) * avg_factor;
m_rtt.jitter_avg = m_rtt.jitter_avg * (num_samples/(num_samples-1)) +
jitter * (1/num_samples);

if (!profiler_id.empty()) {
g_profiler->graphAdd(profiler_id + "_rtt", rtt);
@@ -904,12 +911,16 @@ bool UDPPeer::getAddress(MTProtocols type,Address& toset)

void UDPPeer::reportRTT(float rtt)
{
assert(rtt >= 0.0f);

RTTStatistics(rtt, "rudp");
if (rtt < 0.0) {
return;
}
RTTStatistics(rtt,"rudp",MAX_RELIABLE_WINDOW_SIZE*10);

float timeout = getStat(AVG_RTT) * RESEND_TIMEOUT_FACTOR;
timeout = rangelim(timeout, RESEND_TIMEOUT_MIN, RESEND_TIMEOUT_MAX);
if (timeout < RESEND_TIMEOUT_MIN)
timeout = RESEND_TIMEOUT_MIN;
if (timeout > RESEND_TIMEOUT_MAX)
timeout = RESEND_TIMEOUT_MAX;

MutexAutoLock usage_lock(m_exclusive_access_mutex);
resend_timeout = timeout;
@@ -581,15 +581,15 @@ class Peer {
return m_rtt.jitter_max;
case AVG_JITTER:
return m_rtt.jitter_avg;
case TIMEOUT_COUNTER:
return m_timeout_counter;
}
return -1;
}
protected:
virtual void reportRTT(float rtt) {};

void RTTStatistics(float rtt, const std::string &profiler_id = "");
void RTTStatistics(float rtt,
const std::string &profiler_id = "",
unsigned int num_samples = 1000);

bool IncUseCount();
void DecUseCount();
@@ -1155,17 +1155,19 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Control(Channel *chan

// a overflow is quite unlikely but as it'd result in major
// rtt miscalculation we handle it here
float rtt = 0.0f;
if (current_time > p.absolute_send_time) {
rtt = (current_time - p.absolute_send_time) / 1000.0f;
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);
} else if (p.totaltime > 0) {
rtt = p.totaltime;
}
float rtt = p.totaltime;

// Let peer calculate stuff according to it
// (avg_rtt and resend_timeout)
if (rtt != 0.0f)
// 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);
@@ -30,8 +30,7 @@ typedef enum {
AVG_RTT,
MIN_JITTER,
MAX_JITTER,
AVG_JITTER,
TIMEOUT_COUNTER
AVG_JITTER
} rtt_stat_type;

class Peer;

0 comments on commit 7a0e52a

Please sign in to comment.
You can’t perform that action at this time.