Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:10:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix packet pair sending from SendQueue

Browse source
This commit is contained in:
Stephen Birarda 2015-07-30 10:20:09 -07:00
parent 3d523552f8
commit 57025cff74
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,9 +228,9 @@ SequenceNumber Connection::nextACK() const {
bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber) { bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber) {
// check if this is a packet pair we should estimate bandwidth from, or just a regular packet // check if this is a packet pair we should estimate bandwidth from, or just a regular packet
if (((uint32_t) sequenceNumber & 0xF) == 0) { if (((uint32_t) sequenceNumber & 0xFF) == 0) {
_receiveWindow.onProbePair1Arrival(); _receiveWindow.onProbePair1Arrival();
} else if (((uint32_t) sequenceNumber & 0xF) == 1) { } else if (((uint32_t) sequenceNumber & 0xFF) == 1) {
_receiveWindow.onProbePair2Arrival(); _receiveWindow.onProbePair2Arrival();
} else { } else {
_receiveWindow.onPacketArrival(); _receiveWindow.onPacketArrival();

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

@ -135,13 +135,13 @@ void SendQueue::loop() {
// is greater than or equal to the gap between the last ACKed sent and the one we are about to send // is greater than or equal to the gap between the last ACKed sent and the one we are about to send
if (seqlen(SequenceNumber { (uint32_t) _lastACKSequenceNumber }, _currentSequenceNumber + 1) <= _flowWindowSize) { if (seqlen(SequenceNumber { (uint32_t) _lastACKSequenceNumber }, _currentSequenceNumber + 1) <= _flowWindowSize) {
bool hasResend = false; bool hasResend = false;
SequenceNumber seqNum; SequenceNumber sequenceNumber;
{ {
// Check nak list for packet to resend // Check nak list for packet to resend
QWriteLocker locker(&_naksLock); QWriteLocker locker(&_naksLock);
if (_naks.getLength() > 0) { if (_naks.getLength() > 0) {
hasResend = true; hasResend = true;
seqNum = _naks.popFirstSequenceNumber(); sequenceNumber = _naks.popFirstSequenceNumber();
} }
} }
@ -150,7 +150,7 @@ void SendQueue::loop() {
// Find packet in sent list using SequenceNumber // Find packet in sent list using SequenceNumber
if (hasResend) { if (hasResend) {
QWriteLocker locker(&_sentLock); QWriteLocker locker(&_sentLock);
auto it = _sentPackets.find(seqNum); auto it = _sentPackets.find(sequenceNumber);
Q_ASSERT_X(it != _sentPackets.end(), Q_ASSERT_X(it != _sentPackets.end(),
"SendQueue::sendNextPacket()", "Couldn't find NAKed packet to resend"); "SendQueue::sendNextPacket()", "Couldn't find NAKed packet to resend");
@ -167,8 +167,20 @@ void SendQueue::loop() {
_packets.pop_front(); _packets.pop_front();
} }
bool shouldSendSecondOfPair = false;
if (!hasResend) {
// if we're not re-sending a packet then need to check if this should be a packet pair
sequenceNumber = getNextSequenceNumber();
// the first packet in the pair is every 16 (rightmost 16 bits = 0) packets
if (((uint32_t) sequenceNumber & 0xFF) == 0) {
shouldSendSecondOfPair = true;
}
}
// Write packet's sequence number and send it off // Write packet's sequence number and send it off
nextPacket->writeSequenceNumber(getNextSequenceNumber()); nextPacket->writeSequenceNumber(sequenceNumber);
sendPacket(*nextPacket); sendPacket(*nextPacket);
// Insert the packet we have just sent in the sent list // Insert the packet we have just sent in the sent list
@ -176,6 +188,29 @@ void SendQueue::loop() {
_sentPackets[nextPacket->getSequenceNumber()].swap(nextPacket); _sentPackets[nextPacket->getSequenceNumber()].swap(nextPacket);
Q_ASSERT_X(!nextPacket, Q_ASSERT_X(!nextPacket,
"SendQueue::sendNextPacket()", "Overriden packet in sent list"); "SendQueue::sendNextPacket()", "Overriden packet in sent list");
if (shouldSendSecondOfPair) {
std::unique_ptr<Packet> pairedPacket;
// we've detected we should send the second packet in a pair, do that now before sleeping
{
QWriteLocker locker(&_packetsLock);
pairedPacket.swap(_packets.front());
_packets.pop_front();
}
if (pairedPacket) {
// write this packet's sequence number and send it off
pairedPacket->writeSequenceNumber(getNextSequenceNumber());
sendPacket(*pairedPacket);
// add the paired packet to the sent list
QWriteLocker locker(&_sentLock);
_sentPackets[pairedPacket->getSequenceNumber()].swap(pairedPacket);
Q_ASSERT_X(!pairedPacket,
"SendQueue::sendNextPacket()", "Overriden packet in sent list");
}
}
} }
// since we're a while loop, give the thread a chance to process events // since we're a while loop, give the thread a chance to process events