Browse Source

Use boost:circular_buffer instead of QList.

QList has to store an additional pointer for each element which leads to bad space efficiency.
adaptive-webui-19844
Chocobo1 9 years ago
parent
commit
f13c604fbe
  1. 14
      src/base/bittorrent/private/speedmonitor.cpp
  2. 10
      src/base/bittorrent/private/speedmonitor.h

14
src/base/bittorrent/private/speedmonitor.cpp

@ -27,17 +27,21 @@
* exception statement from your version. * exception statement from your version.
*/ */
#include <QList>
#include "speedmonitor.h" #include "speedmonitor.h"
SpeedMonitor::SpeedMonitor()
: m_speedSamples(MAX_SAMPLES)
{
}
void SpeedMonitor::addSample(const SpeedSample &sample) void SpeedMonitor::addSample(const SpeedSample &sample)
{ {
m_speedSamples.push_back(sample); if (m_speedSamples.size() >= MAX_SAMPLES) {
m_sum += sample;
if (m_speedSamples.size() > MAX_SAMPLES) {
m_sum -= m_speedSamples.front(); m_sum -= m_speedSamples.front();
m_speedSamples.pop_front();
} }
m_speedSamples.push_back(sample);
m_sum += sample;
} }
SpeedSampleAvg SpeedMonitor::average() const SpeedSampleAvg SpeedMonitor::average() const

10
src/base/bittorrent/private/speedmonitor.h

@ -30,7 +30,11 @@
#ifndef SPEEDMONITOR_H #ifndef SPEEDMONITOR_H
#define SPEEDMONITOR_H #define SPEEDMONITOR_H
template<typename T> class QList; #ifndef Q_MOC_RUN
#include <boost/circular_buffer.hpp>
#endif
#include <QtGlobal>
template<typename T> template<typename T>
struct Sample struct Sample
@ -71,13 +75,15 @@ typedef Sample<qreal> SpeedSampleAvg;
class SpeedMonitor class SpeedMonitor
{ {
public: public:
SpeedMonitor();
void addSample(const SpeedSample &sample); void addSample(const SpeedSample &sample);
SpeedSampleAvg average() const; SpeedSampleAvg average() const;
void reset(); void reset();
private: private:
static const int MAX_SAMPLES = 30; static const int MAX_SAMPLES = 30;
QList<SpeedSample> m_speedSamples; boost::circular_buffer<SpeedSample> m_speedSamples;
SpeedSample m_sum; SpeedSample m_sum;
}; };

Loading…
Cancel
Save