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

fix units for timeout check on expiry

Browse source
This commit is contained in:
Stephen Birarda 2016-03-21 10:15:55 -07:00
parent b7ff94e20d
commit b059e98ff5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/networking/src/udt/SendQueue.cpp
View file

@ -20,6 +20,7 @@
#include <QtCore/QThread> #include <QtCore/QThread>
#include <LogHandler.h> #include <LogHandler.h>
#include <NumericalConstants.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "../NetworkLogging.h" #include "../NetworkLogging.h"
@ -439,19 +440,19 @@ bool SendQueue::isInactive(bool sentAPacket) {
// that will be the case if we have had 16 timeouts since hearing back from the client, and it has been // that will be the case if we have had 16 timeouts since hearing back from the client, and it has been
// at least 5 seconds // at least 5 seconds
static const int NUM_TIMEOUTS_BEFORE_INACTIVE = 16; static const int NUM_TIMEOUTS_BEFORE_INACTIVE = 16;
static const int MIN_SECONDS_BEFORE_INACTIVE_MS = 5 * 1000; static const int MIN_MS_BEFORE_INACTIVE = 5 * 1000;
auto sinceLastResponse = (QDateTime::currentMSecsSinceEpoch() - _lastReceiverResponse); auto sinceLastResponse = (QDateTime::currentMSecsSinceEpoch() - _lastReceiverResponse);
if (sinceLastResponse >= quint64(NUM_TIMEOUTS_BEFORE_INACTIVE * _estimatedTimeout) && if (sinceLastResponse >= quint64(NUM_TIMEOUTS_BEFORE_INACTIVE * (_estimatedTimeout / USECS_PER_MSEC)) &&
_lastReceiverResponse > 0 && _lastReceiverResponse > 0 &&
sinceLastResponse > MIN_SECONDS_BEFORE_INACTIVE_MS) { sinceLastResponse > MIN_MS_BEFORE_INACTIVE) {
// If the flow window has been full for over CONSIDER_INACTIVE_AFTER, // If the flow window has been full for over CONSIDER_INACTIVE_AFTER,
// then signal the queue is inactive and return so it can be cleaned up // then signal the queue is inactive and return so it can be cleaned up
#ifdef UDT_CONNECTION_DEBUG #ifdef UDT_CONNECTION_DEBUG
qCDebug(networking) << "SendQueue to" << _destination << "reached" << NUM_TIMEOUTS_BEFORE_INACTIVE << "timeouts" qCDebug(networking) << "SendQueue to" << _destination << "reached" << NUM_TIMEOUTS_BEFORE_INACTIVE << "timeouts"
<< "and 5s before receiving any ACK/NAK and is now inactive. Stopping."; << "and" << MIN_MS_BEFORE_INACTIVE << "milliseconds before receiving any ACK/NAK and is now inactive. Stopping.";
#endif #endif
deactivate(); deactivate();