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

Cleanup sendACK

Browse source
This commit is contained in:
Atlante45 2015-07-29 15:43:44 -07:00
parent 5236abe561
commit 785d14f835
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ void Connection::sync() {
// check if we need to re-transmit a loss list // check if we need to re-transmit a loss list
// we do this if it has been longer than the current nakInterval since we last sent // we do this if it has been longer than the current nakInterval since we last sent
auto now = high_resolution_clock::now(); auto now = high_resolution_clock::now();
if (duration_cast<microseconds>(now - _lastNAKTime).count() >= _nakInterval) { if (duration_cast<microseconds>(now - _lastNAKTime).count() >= _nakInterval) {
// Send a timeout NAK packet // Send a timeout NAK packet
sendTimeoutNAK(); sendTimeoutNAK();
@ -71,26 +71,19 @@ void Connection::sync() {
} }
void Connection::sendACK(bool wasCausedBySyncTimeout) { void Connection::sendACK(bool wasCausedBySyncTimeout) {
auto currentTime = high_resolution_clock::now();
static high_resolution_clock::time_point lastACKSendTime; static high_resolution_clock::time_point lastACKSendTime;
auto currentTime = high_resolution_clock::now();
SequenceNumber nextACKNumber = nextACK(); SequenceNumber nextACKNumber = nextACK();
Q_ASSERT_X(nextACKNumber < _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong");
if (nextACKNumber <= _lastReceivedAcknowledgedACK) { if (nextACKNumber == _lastSentACK) {
// we already got an ACK2 for this ACK we would be sending, don't bother
return;
}
if (nextACKNumber >= _lastSentACK) {
// we have received new packets since the last sent ACK
// update the last sent ACK
_lastSentACK = nextACKNumber;
// remove the ACKed packets from the receive queue
} else if (nextACKNumber == _lastSentACK) {
// We already sent this ACK, but check if we should re-send it. // We already sent this ACK, but check if we should re-send it.
if (nextACKNumber <= _lastReceivedAcknowledgedACK) {
// we already got an ACK2 for this ACK we would be sending, don't bother
return;
}
// We will re-send if it has been more than the estimated timeout since the last ACK // We will re-send if it has been more than the estimated timeout since the last ACK
microseconds sinceLastACK = duration_cast<microseconds>(currentTime - lastACKSendTime); microseconds sinceLastACK = duration_cast<microseconds>(currentTime - lastACKSendTime);
@ -98,6 +91,13 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
return; return;
} }
} }
// we have received new packets since the last sent ACK
// update the last sent ACK
_lastSentACK = nextACKNumber;
// remove the ACKed packets from the receive queue
// TODO?
// setup the ACK packet, make it static so we can re-use it // setup the ACK packet, make it static so we can re-use it
static const int ACK_PACKET_PAYLOAD_BYTES = sizeof(_lastSentACK) + sizeof(_currentACKSubSequenceNumber) static const int ACK_PACKET_PAYLOAD_BYTES = sizeof(_lastSentACK) + sizeof(_currentACKSubSequenceNumber)
@ -129,7 +129,7 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
_sendQueue->sendPacket(*ackPacket); _sendQueue->sendPacket(*ackPacket);
// write this ACK to the map of sent ACKs // write this ACK to the map of sent ACKs
_sentACKs[_currentACKSubSequenceNumber] = { nextACKNumber, high_resolution_clock::now() }; _sentACKs[_currentACKSubSequenceNumber] = { nextACKNumber, currentTime };
// reset the number of data packets received since last ACK // reset the number of data packets received since last ACK
_packetsSinceACK = 0; _packetsSinceACK = 0;
@ -218,7 +218,7 @@ void Connection::sendTimeoutNAK() {
SequenceNumber Connection::nextACK() const { SequenceNumber Connection::nextACK() const {
if (_lossList.getLength() > 0) { if (_lossList.getLength() > 0) {
return _lossList.getFirstSequenceNumber(); return _lossList.getFirstSequenceNumber() - 1;
} else { } else {
return _lastReceivedSequenceNumber; return _lastReceivedSequenceNumber;
} }