Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 06:00:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix method signatures, adjust ssthresh increases

Browse source
This commit is contained in:
Stephen Birarda 2016-09-26 11:05:44 -07:00
parent eb180b15d8
commit 8c9b46c1e0
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/networking/src/udt/TCPVegasCC.cpp
View file

@ -42,9 +42,12 @@ void TCPVegasCC::onACK(SequenceNumber ackNum) {
++_numRTT;
if (ackNum > _lastRTTMaxSeqNum) {
performCongestionAvoidance(ackNum);
int numACK = seqlen(_lastACK, ackNum);
performCongestionAvoidance(ackNum, numACK);
}
_lastACK = ackNum;
} else {
Q_ASSERT_X(false,
"TCPVegasCC::onACK",
@ -52,7 +55,7 @@ void TCPVegasCC::onACK(SequenceNumber ackNum) {
}
}
void TCPVegasCC::performCongestionAvoidance(udt::SequenceNumber ack) {
void TCPVegasCC::performCongestionAvoidance(udt::SequenceNumber ack, int numACK) {
static int VEGAS_MIN_RTT_FOR_CALC = 3;
static uint64_t VEGAS_ALPHA_SEGMENTS = 2;
@ -63,7 +66,8 @@ void TCPVegasCC::performCongestionAvoidance(udt::SequenceNumber ack) {
// Vegas calculations are only done if there are enough RTT samples to be
// pretty sure that at least one sample did not come from a delayed ACK.
// If that is the case, we fallback to the Reno behaviour
TCPRenoCC::performCongestionAvoidance(ack);
TCPRenoCC::performCongestionAvoidance(ack, numACK);
} else {
// There are enough RTT samples, use the Vegas algorithm to see if we should
// increase or decrease the congestion window size, and by how much
@ -106,20 +110,23 @@ void TCPVegasCC::performCongestionAvoidance(udt::SequenceNumber ack) {
}
}
if (!inWindowReduction) {
// we didn't reduce the congestion window size, so it is now time to raise the slow start threshold
// we never allow the congestion window to be smaller than two packets
static uint64_t VEGAS_CW_MIN_PACKETS = 2;
_congestionWindowSize = std::min(_congestionWindowSize, VEGAS_CW_MIN_PACKETS);
// we never allow the congestion window to be smaller than two packets
static uint64_t VEGAS_CW_MIN_PACKETS = 2;
_congestionWindowSize = std::min(_congestionWindowSize, VEGAS_CW_MIN_PACKETS);
if (!inWindowReduction && _congestionWindowSize > _slowStartThreshold) {
// if we didn't just reduce the congestion window size and the
// the congestion window is greater than the slow start threshold
// we raise the slow start threshold half the distance to the congestion window
_slowStartThreshold = (_congestionWindowSize >> 1) + (_congestionWindowSize >> 2);
}
_lastRTTMaxSeqNum = _sendCurrSeqNum;
// reset our state for the next RTT
_currentMinRTT = std::numeric_limits<int>::max();
_numRTT = 0;
}
_lastRTTMaxSeqNum = _sendCurrSeqNum;
// reset our state for the next RTT
_currentMinRTT = std::numeric_limits<int>::max();
_numRTT = 0;
}

2
libraries/networking/src/udt/TCPVegasCC.h
View file

@ -34,7 +34,7 @@ public:
virtual void onPacketSent(int packetSize, SequenceNumber seqNum) override;
protected:
virtual void performCongestionAvoidance(SequenceNumber ack) override;
virtual void performCongestionAvoidance(SequenceNumber ack, int numACK) override;
private:
void adjustSlowStartThreshold()
{ _slowStartThreshold = std::min(_slowStartThreshold, (uint32_t) _congestionWindowSize - 1); }