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

make sure we init CongestionControl

Browse source
This commit is contained in:
Stephen Birarda 2015-07-31 16:52:09 -07:00
parent 84b8fc9f06
commit fa6628e7eb
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,11 +18,13 @@ 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) { void CongestionControl::setPacketSendPeriod(double newSendPeriod) {
Q_ASSERT_X(newSendPeriod >= 0, "CongestionControl::setPacketPeriod", "Can not set a negative packet send period");
if (_maxBandwidth > 0) { if (_maxBandwidth > 0) {
// anytime the packet send period is about to be increased, make sure it stays below the minimum period, // 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 // calculated based on the maximum desired bandwidth
int minPacketSendPeriod = USECS_PER_SECOND / (double(_maxBandwidth) / _mss); double minPacketSendPeriod = USECS_PER_SECOND / (((double) _maxBandwidth) / _mss);
_packetSendPeriod = std::max(newSendPeriod, (double) minPacketSendPeriod); _packetSendPeriod = std::max(newSendPeriod, minPacketSendPeriod);
} else { } else {
_packetSendPeriod = newSendPeriod; _packetSendPeriod = newSendPeriod;
} }

3
libraries/networking/src/udt/Connection.cpp
View file

@ -32,6 +32,9 @@ Connection::Connection(Socket* parentSocket, HifiSockAddr destination, unique_pt
{ {
Q_ASSERT_X(socket, "Connection::Connection", "Must be called with a valid Socket*"); Q_ASSERT_X(socket, "Connection::Connection", "Must be called with a valid Socket*");
Q_ASSERT_X(congestionControl, "Connection::Connection", "Must be called with a valid CongestionControl object");
congestionControl->init();
// setup default SYN, RTT and RTT Variance based on the SYN interval in CongestionControl object // setup default SYN, RTT and RTT Variance based on the SYN interval in CongestionControl object
_synInterval = _congestionControl->synInterval(); _synInterval = _congestionControl->synInterval();
_rtt = _synInterval * 10; _rtt = _synInterval * 10;