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

Safe locks

Browse source
This commit is contained in:
Atlante45 2015-08-03 14:39:51 -07:00
parent 7bfc9f7fd1
commit a1bd558d71
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,16 +151,15 @@ void SendQueue::run() {
while (!resentPacket) {
// prioritize a loss retransmission
_naksLock.lockForWrite();
QWriteLocker naksLocker(&_naksLock);
if (_naks.getLength() > 0) {
// pull the sequence number we need to re-send
SequenceNumber resendNumber = _naks.popFirstSequenceNumber();
_naksLock.unlock();
naksLocker.unlock();
// pull the packet to re-send from the sent packets list
_sentLock.lockForRead();
QReadLocker sentLocker(&_sentLock);
// see if we can find the packet to re-send
auto it = _sentPackets.find(resendNumber);
@ -170,7 +169,7 @@ void SendQueue::run() {
auto& resendPacket = *(it->second);
// unlock the sent packets
_sentLock.unlock();
sentLocker.unlock();
// send it off
sendPacket(resendPacket);
@ -184,18 +183,12 @@ void SendQueue::run() {
} else {
// we didn't find this packet in the sentPackets queue - assume this means it was ACKed
// we'll fire the loop again to see if there is another to re-send
// unlock the sent packets
_sentLock.unlock();
continue;
}
} else {
// unlock the loss list, it's empty
_naksLock.unlock();
// break from the while, we didn't resend a packet
break;
}
// break from the while, we didn't resend a packet
break;
}
if (!resentPacket