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

Make sure everyone calls sendPeriod's setter

Browse source
This commit is contained in:
Atlante45 2016-03-21 14:49:42 -07:00
parent 605cc625d6
commit c48be75a37
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/networking/src/udt/CongestionControl.cpp
View file

@ -39,7 +39,7 @@ DefaultCC::DefaultCC() :
_mss = udt::MAX_PACKET_SIZE_WITH_UDP_HEADER; _mss = udt::MAX_PACKET_SIZE_WITH_UDP_HEADER;
_congestionWindowSize = 16.0; _congestionWindowSize = 16.0;
_packetSendPeriod = 1.0; setPacketSendPeriod(1.0);
} }
void DefaultCC::onACK(SequenceNumber ackNum) { void DefaultCC::onACK(SequenceNumber ackNum) {
@ -73,10 +73,10 @@ void DefaultCC::onACK(SequenceNumber ackNum) {
if (_receiveRate > 0) { if (_receiveRate > 0) {
// if we have a valid receive rate we set the send period to whatever the receive rate dictates // if we have a valid receive rate we set the send period to whatever the receive rate dictates
_packetSendPeriod = USECS_PER_SECOND / _receiveRate; setPacketSendPeriod(USECS_PER_SECOND / _receiveRate);
} else { } else {
// no valid receive rate, packet send period is dictated by estimated RTT and current congestion window size // no valid receive rate, packet send period is dictated by estimated RTT and current congestion window size
_packetSendPeriod = (_rtt + synInterval()) / _congestionWindowSize; setPacketSendPeriod((_rtt + synInterval()) / _congestionWindowSize);
} }
} }
} else { } else {
@ -148,8 +148,8 @@ void DefaultCC::onLoss(SequenceNumber rangeStart, SequenceNumber rangeEnd) {
if (rangeStart > _lastDecreaseMaxSeq) { if (rangeStart > _lastDecreaseMaxSeq) {
_lastDecreasePeriod = _packetSendPeriod; _lastDecreasePeriod = _packetSendPeriod;
_packetSendPeriod = ceil(_packetSendPeriod * INTER_PACKET_ARRIVAL_INCREASE); setPacketSendPeriod(ceil(_packetSendPeriod * INTER_PACKET_ARRIVAL_INCREASE));
// use EWMA to update the average number of NAKs per congestion // use EWMA to update the average number of NAKs per congestion
static const double NAK_EWMA_ALPHA = 0.125; static const double NAK_EWMA_ALPHA = 0.125;
@ -175,7 +175,7 @@ void DefaultCC::onLoss(SequenceNumber rangeStart, SequenceNumber rangeEnd) {
// there have been fewer than MAX_DECREASES_PER_CONGESTION_EPOCH AND this NAK matches the random count at which we // there have been fewer than MAX_DECREASES_PER_CONGESTION_EPOCH AND this NAK matches the random count at which we
// decided we would decrease the packet send period // decided we would decrease the packet send period
_packetSendPeriod = ceil(_packetSendPeriod * INTER_PACKET_ARRIVAL_INCREASE); setPacketSendPeriod(ceil(_packetSendPeriod * INTER_PACKET_ARRIVAL_INCREASE));
_lastDecreaseMaxSeq = _sendCurrSeqNum; _lastDecreaseMaxSeq = _sendCurrSeqNum;
} }
} }
@ -198,12 +198,12 @@ void DefaultCC::stopSlowStart() {
if (_receiveRate > 0) { if (_receiveRate > 0) {
// Set the sending rate to the receiving rate. // Set the sending rate to the receiving rate.
_packetSendPeriod = USECS_PER_SECOND / _receiveRate; setPacketSendPeriod(USECS_PER_SECOND / _receiveRate);
} else { } else {
// If no receiving rate is observed, we have to compute the sending // If no receiving rate is observed, we have to compute the sending
// rate according to the current window size, and decrease it // rate according to the current window size, and decrease it
// using the method below. // using the method below.
_packetSendPeriod = _congestionWindowSize / (_rtt + synInterval()); setPacketSendPeriod(_congestionWindowSize / (_rtt + synInterval()));
} }
} }