From 14f50f4576b65dbe0bd257c5a30c3ced4efb8ceb Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 16 Jun 2014 14:05:27 -0700 Subject: [PATCH] removed old SentPacketHistory --- .../src/octree/SentPacketHistory.cpp | 44 ------------------- .../src/octree/SentPacketHistory.h | 35 --------------- 2 files changed, 79 deletions(-) delete mode 100644 assignment-client/src/octree/SentPacketHistory.cpp delete mode 100644 assignment-client/src/octree/SentPacketHistory.h diff --git a/assignment-client/src/octree/SentPacketHistory.cpp b/assignment-client/src/octree/SentPacketHistory.cpp deleted file mode 100644 index 0ea7fd8b69..0000000000 --- a/assignment-client/src/octree/SentPacketHistory.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// SentPacketHistory.cpp -// assignement-client/src/octree -// -// Created by Yixin Wang on 6/5/2014 -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#include "SentPacketHistory.h" - -SentPacketHistory::SentPacketHistory(int size) - : _sentPackets(size), - _newestPacketAt(0), - _numExistingPackets(0), - _newestSequenceNumber(0) -{ -} - -void SentPacketHistory::packetSent(OCTREE_PACKET_SEQUENCE sequenceNumber, const QByteArray& packet) { - _newestSequenceNumber = sequenceNumber; - - // increment _newestPacketAt cyclically, insert new packet there. - // this will overwrite the oldest packet in the buffer - _newestPacketAt = (_newestPacketAt == _sentPackets.size() - 1) ? 0 : _newestPacketAt + 1; - _sentPackets[_newestPacketAt] = packet; - if (_numExistingPackets < _sentPackets.size()) { - _numExistingPackets++; - } -} - - -const QByteArray* SentPacketHistory::getPacket(OCTREE_PACKET_SEQUENCE sequenceNumber) const { - OCTREE_PACKET_SEQUENCE seqDiff = _newestSequenceNumber - sequenceNumber; - if (!(seqDiff >= 0 && seqDiff < _numExistingPackets)) { - return NULL; - } - int packetAt = _newestPacketAt - seqDiff; - if (packetAt < 0) { - packetAt += _sentPackets.size(); - } - return &_sentPackets.at(packetAt); -} diff --git a/assignment-client/src/octree/SentPacketHistory.h b/assignment-client/src/octree/SentPacketHistory.h deleted file mode 100644 index 4231400ac1..0000000000 --- a/assignment-client/src/octree/SentPacketHistory.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// SentPacketHistory.h -// assignement-client/src/octree -// -// Created by Yixin Wang on 6/5/2014 -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#ifndef hifi_SentPacketHistory_h -#define hifi_SentPacketHistory_h - -#include -#include - -#include "OctreePacketData.h" - -class SentPacketHistory { - -public: - SentPacketHistory(int size); - - void packetSent(OCTREE_PACKET_SEQUENCE sequenceNumber, const QByteArray& packet); - const QByteArray* getPacket(OCTREE_PACKET_SEQUENCE sequenceNumber) const; - -private: - QVector _sentPackets; // circular buffer - int _newestPacketAt; - int _numExistingPackets; - - OCTREE_PACKET_SEQUENCE _newestSequenceNumber; -}; - -#endif