Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 13:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make SentPacketHistory use NLPacket

Browse source
This commit is contained in:
Stephen Birarda 2015-07-07 12:14:40 -07:00
parent 74924bc5f1
commit fca23cc69b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -365,10 +365,10 @@ bool OctreeQueryNode::hasNextNackedPacket() const {
return !_nackedSequenceNumbers.isEmpty(); return !_nackedSequenceNumbers.isEmpty();
} }
NLPacket&& OctreeQueryNode::getNextNackedPacket() { NLPacket* OctreeQueryNode::getNextNackedPacket() {
if (!_nackedSequenceNumbers.isEmpty()) { if (!_nackedSequenceNumbers.isEmpty()) {
// could return null if packet is not in the history // could return null if packet is not in the history
return std::move(_sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue())); return _sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue());
} }
return nullptr; return nullptr;

2
assignment-client/src/octree/OctreeQueryNode.h
View file

@ -111,7 +111,7 @@ public:
void parseNackPacket(const QByteArray& packet); void parseNackPacket(const QByteArray& packet);
bool hasNextNackedPacket() const; bool hasNextNackedPacket() const;
NLPacket&& getNextNackedPacket(); NLPacket* getNextNackedPacket();
private slots: private slots:
void sendThreadFinished(); void sendThreadFinished();

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

@ -20,7 +20,7 @@ SentPacketHistory::SentPacketHistory(int size)
} }
void SentPacketHistory::packetSent(uint16_t sequenceNumber, const QByteArray& packet) { void SentPacketHistory::packetSent(uint16_t sequenceNumber, const NLPacket& packet) {
// check if given seq number has the expected value. if not, something's wrong with // check if given seq number has the expected value. if not, something's wrong with
// the code calling this function // the code calling this function
@ -30,7 +30,7 @@ void SentPacketHistory::packetSent(uint16_t sequenceNumber, const QByteArray& pa
<< "Expected:" << expectedSequenceNumber << "Actual:" << sequenceNumber; << "Expected:" << expectedSequenceNumber << "Actual:" << sequenceNumber;
} }
_newestSequenceNumber = sequenceNumber; _newestSequenceNumber = sequenceNumber;
_sentPackets.insert(packet); _sentPackets.insert(new NLPacket(packet));
} }
const QByteArray* SentPacketHistory::getPacket(uint16_t sequenceNumber) const { const QByteArray* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {

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

@ -26,7 +26,7 @@ public:
const QByteArray* getPacket(uint16_t sequenceNumber) const; const QByteArray* getPacket(uint16_t sequenceNumber) const;
private: private:
RingBufferHistory<NLPacket> _sentPackets; // circular buffer RingBufferHistory<NLPacket*> _sentPackets; // circular buffer
uint16_t _newestSequenceNumber; uint16_t _newestSequenceNumber;
}; };