Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make packet send period update respect max bandwidth

Browse source
This commit is contained in:
Stephen Birarda 2015-07-31 09:02:43 -07:00
parent 0ea1bb578f
commit c2d39f0f6a
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,17 @@ using namespace std::chrono;
static const double USECS_PER_SECOND = 1000000.0; static const double USECS_PER_SECOND = 1000000.0;
void CongestionControl::setPacketSendPeriod(double newSendPeriod) {
if (_maxBandwidth > 0) {
// anytime the packet send period is about to be increased, make sure it stays below the minimum period,
// calculated based on the maximum desired bandwidth
int minPacketSendPeriod = USECS_PER_SECOND / (double(_maxBandwidth) / _mss);
_packetSendPeriod = std::max(newSendPeriod, (double) minPacketSendPeriod);
} else {
_packetSendPeriod = newSendPeriod;
}
}
void DefaultCC::init() { void DefaultCC::init() {
_lastRCTime = high_resolution_clock::now(); _lastRCTime = high_resolution_clock::now();
@ -111,15 +122,7 @@ void DefaultCC::onACK(SequenceNumber ackNum) {
} }
} }
_packetSendPeriod = (_packetSendPeriod * synInterval()) / (_packetSendPeriod * increase + synInterval()); setPacketSendPeriod((_packetSendPeriod * synInterval()) / (_packetSendPeriod * increase + synInterval()));
if (_maxBandwidth > 0) {
// anytime the packet send period is about to be increased, make sure it stays below the minimum period,
// calculated based on the maximum desired bandwidth
int minPacketSendPeriod = USECS_PER_SECOND / (double(_maxBandwidth) / _mss);
_packetSendPeriod = std::max(_packetSendPeriod, (double) minPacketSendPeriod);
}
} }
void DefaultCC::onLoss(SequenceNumber rangeStart, SequenceNumber rangeEnd) { void DefaultCC::onLoss(SequenceNumber rangeStart, SequenceNumber rangeEnd) {

1
libraries/networking/src/udt/CongestionControl.h
View file

@ -51,6 +51,7 @@ protected:
void setSendCurrentSequenceNumber(SequenceNumber seqNum) { _sendCurrSeqNum = seqNum; } void setSendCurrentSequenceNumber(SequenceNumber seqNum) { _sendCurrSeqNum = seqNum; }
void setReceiveRate(int rate) { _receiveRate = rate; } void setReceiveRate(int rate) { _receiveRate = rate; }
void setRTT(int rtt) { _rtt = rtt; } void setRTT(int rtt) { _rtt = rtt; }
void setPacketSendPeriod(double newSendPeriod); // call this internally to ensure send period doesn't go past max bandwidth
double _packetSendPeriod { 1.0 }; // Packet sending period, in microseconds double _packetSendPeriod { 1.0 }; // Packet sending period, in microseconds
double _congestionWindowSize { 16.0 }; // Congestion window size, in packets double _congestionWindowSize { 16.0 }; // Congestion window size, in packets