Rewritten SpeedCalc

1 files changed, 7 insertions, 11 deletions

diff --git a/src/SpeedCalc.h b/src/SpeedCalc.h
index c41574f6..b337bdcb 100644
--- a/src/SpeedCalc.h
+++ b/src/SpeedCalc.h
@@ -36,29 +36,25 @@
 #define D_SPEED_CALC_H
 
 #include "common.h"
+
+#include <deque>
+
 #include "TimerA2.h"
 
 namespace aria2 {
 
 class SpeedCalc {
 private:
-  int64_t lengthArray_[2];
-  int sw_;
-  Timer cpArray_[2];
-  int maxSpeed_;
-  int prevSpeed_;
+  std::deque<std::pair<int64_t, size_t> > timeSlots_;
   Timer start_;
   int64_t accumulatedLength_;
-  time_t nextInterval_;
-
-  bool isIntervalOver(int64_t milliElapsed) const;
+  int64_t bytesWindow_;
+  int maxSpeed_;
 
-  void changeSw();
+  void removeStaleTimeSlot(int64_t now);
 public:
   SpeedCalc();
 
-  bool isIntervalOver() const;
-
   /**
    * Returns download/upload speed in byte per sec
    */