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

guard insert/get in SentPacketHistory

Browse source
This commit is contained in:
Stephen Birarda 2015-09-30 14:13:36 -04:00
parent 1f1eb00c63
commit cc6b0adb7d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/SentPacketHistory.cpp
View file

@ -35,10 +35,11 @@ void SentPacketHistory::packetSent(uint16_t sequenceNumber, const NLPacket& pack
} }
_newestSequenceNumber = sequenceNumber; _newestSequenceNumber = sequenceNumber;
QWriteLocker locker(&_packetsLock);
_sentPackets.insert(NLPacket::createCopy(packet)); _sentPackets.insert(NLPacket::createCopy(packet));
} }
const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const { const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) {
const int UINT16_RANGE = std::numeric_limits<uint16_t>::max() + 1; const int UINT16_RANGE = std::numeric_limits<uint16_t>::max() + 1;
@ -48,6 +49,7 @@ const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
if (seqDiff < 0) { if (seqDiff < 0) {
seqDiff += UINT16_RANGE; seqDiff += UINT16_RANGE;
} }
QReadLocker locker(&_packetsLock);
return _sentPackets.get(seqDiff)->get(); return _sentPackets.get(seqDiff)->get();
} }

7
libraries/networking/src/SentPacketHistory.h
View file

@ -12,7 +12,9 @@
#define hifi_SentPacketHistory_h #define hifi_SentPacketHistory_h
#include <stdint.h> #include <stdint.h>
#include <qbytearray.h>
#include <QtCore/QByteArray>
#include <QtCore/QReadWriteLock>
#include "NLPacket.h" #include "NLPacket.h"
#include "RingBufferHistory.h" #include "RingBufferHistory.h"
@ -26,9 +28,10 @@ public:
SentPacketHistory(int size = MAX_REASONABLE_SEQUENCE_GAP); SentPacketHistory(int size = MAX_REASONABLE_SEQUENCE_GAP);
void packetSent(uint16_t sequenceNumber, const NLPacket& packet); void packetSent(uint16_t sequenceNumber, const NLPacket& packet);
const NLPacket* getPacket(uint16_t sequenceNumber) const; const NLPacket* getPacket(uint16_t sequenceNumber);
private: private:
QReadWriteLock _packetsLock { QReadWriteLock::Recursive };
RingBufferHistory<std::unique_ptr<NLPacket>> _sentPackets; // circular buffer RingBufferHistory<std::unique_ptr<NLPacket>> _sentPackets; // circular buffer
uint16_t _newestSequenceNumber; uint16_t _newestSequenceNumber;