Reworked download/upload statistics calculation

The old implementation calculates download/upload statistics for a
RequestGroup by summing up all PeerStat objects. For global
statistics, those are summed together. This clearly incurs runtime
penalty and we introduced some kind of caching which updates
statistics every 250ms but it did not work right.

This change removes all these aggregation code, and instead makes
RequestGroup and RequestGroupMan objects hold NetStat object and
download/upload bytes are directly calculated by thier own NetStat.
This is far more simplar than the old way and less runtime penalty and
brings more accuracy.

src/AbstractCommand.cc

@@ -431,7 +431,7 @@ void AbstractCommand::onAbort() {
     // limitation of current implementation.
     if(!getOption()->getAsBool(PREF_ALWAYS_RESUME) &&
        fileEntry_ &&
-       getSegmentMan()->calculateSessionDownloadLength() == 0 &&
+       getDownloadContext()->getNetStat().getSessionDownloadLength() == 0 &&
        !requestGroup_->p2pInvolved() &&
        getDownloadContext()->getFileEntries().size() == 1) {
       const int maxTries = getOption()->getAsInt(PREF_MAX_RESUME_FAILURE_TRIES);

src/BtPieceMessage.cc

@@ -100,6 +100,7 @@ void BtPieceMessage::doReceivedAction()
   RequestSlot slot = getBtMessageDispatcher()->getOutstandingRequest
     (index_, begin_, blockLength_);
   getPeer()->updateDownloadLength(blockLength_);
+  downloadContext_->updateDownloadLength(blockLength_);
   if(!RequestSlot::isNull(slot)) {
     getPeer()->snubbing(false);
     SharedHandle<Piece> piece = getPieceStorage()->getPiece(index_);
@@ -188,6 +189,7 @@ void BtPieceMessage::send()
   }
   writtenLength = getPeerConnection()->sendPendingData();
   getPeer()->updateUploadLength(writtenLength);
+  downloadContext_->updateUploadLength(writtenLength);
   setSendingInProgress(!getPeerConnection()->sendBufferIsEmpty());
 }
 

src/BtSetup.cc

@@ -171,7 +171,7 @@ void BtSetup::setup(std::vector<Command*>& commands,
           (new ShareRatioSeedCriteria(option->getAsDouble(PREF_SEED_RATIO),
                                       requestGroup->getDownloadContext()));
         cri->setPieceStorage(pieceStorage);
-        cri->setPeerStorage(peerStorage);
+        cri->setBtRuntime(btRuntime);
 
         unionCri->addSeedCriteria(cri);
       }

src/ConsoleStatCalc.cc

@@ -304,10 +304,8 @@ ConsoleStatCalc::calculateStat(const DownloadEngine* e)
 
   if(e->getRequestGroupMan()->countRequestGroup() > 1 &&
      !e->getRequestGroupMan()->downloadFinished()) {
-    TransferStat stat = e->getRequestGroupMan()->calculateStat();
-    o << " "
-      << "[TOTAL SPD:"
-      << sizeFormatter(stat.getDownloadSpeed()) << "Bs" << "]";
+    int spd = e->getRequestGroupMan()->getNetStat().calculateDownloadSpeed();
+    o << " [TOTAL SPD:" << sizeFormatter(spd) << "Bs" << "]";
   }
 
   {

src/DefaultBtAnnounce.cc

@@ -141,7 +141,7 @@ std::string DefaultBtAnnounce::getAnnounceUrl() {
   if(!btRuntime_->lessThanMinPeers() || btRuntime_->isHalt()) {
     numWant = 0;
   }
-  TransferStat stat = peerStorage_->calculateStat();
+  NetStat& stat = downloadContext_->getNetStat();
   int64_t left =
     pieceStorage_->getTotalLength()-pieceStorage_->getCompletedLength();
   // Use last 8 bytes of peer ID as a key

src/DefaultBtInteractive.cc

@@ -305,8 +305,6 @@ size_t DefaultBtInteractive::receiveMessages() {
       }
       break;
     case BtPieceMessage::ID:
-      peerStorage_->updateTransferStatFor(peer_);
-      // pass through
     case BtRequestMessage::ID:
       inactiveTimer_ = global::wallclock();
       break;

src/DefaultBtMessageDispatcher.cc

@@ -100,9 +100,6 @@ void DefaultBtMessageDispatcher::sendMessages() {
       }
     }
     msg->send();
-    if(msg->isUploading()) {
-      peerStorage_->updateTransferStatFor(peer_);
-    }
     if(msg->isSendingInProgress()) {
       messageQueue_.push_front(msg);
       break;

src/DefaultBtProgressInfoFile.cc

@@ -159,8 +159,8 @@ void DefaultBtProgressInfoFile::save()
     uint64_t uploadLengthNL = 0;
 #ifdef ENABLE_BITTORRENT
     if(torrentDownload) {
-      TransferStat stat = peerStorage_->calculateStat();
-      uploadLengthNL = hton64(stat.getAllTimeUploadLength());
+      uploadLengthNL = hton64(btRuntime_->getUploadLengthAtStartup()+
+                              dctx_->getNetStat().getSessionUploadLength());
     }
 #endif // ENABLE_BITTORRENT
     WRITE_CHECK(fp, &uploadLengthNL, sizeof(uploadLengthNL));

src/DefaultPeerStorage.cc

@@ -60,8 +60,6 @@ const size_t MAX_PEER_LIST_UPDATE = 100;
 
 DefaultPeerStorage::DefaultPeerStorage()
   : maxPeerListSize_(MAX_PEER_LIST_SIZE),
-    removedPeerSessionDownloadLength_(0LL),
-    removedPeerSessionUploadLength_(0LL),
     seederStateChoke_(new BtSeederStateChoke()),
     leecherStateChoke_(new BtLeecherStateChoke()),
     lastTransferStatMapUpdated_(0)
@@ -241,76 +239,6 @@ void DefaultPeerStorage::getActivePeers
   std::for_each(peers_.begin(), peers_.end(), CollectActivePeer(activePeers));
 }
 
-namespace {
-TransferStat calculateStatFor(const SharedHandle<Peer>& peer)
-{
-  TransferStat s;
-  s.downloadSpeed = peer->calculateDownloadSpeed();
-  s.uploadSpeed = peer->calculateUploadSpeed();
-  s.sessionDownloadLength = peer->getSessionDownloadLength();
-  s.sessionUploadLength = peer->getSessionUploadLength();
-  return s;
-}
-} // namespace
-
-TransferStat DefaultPeerStorage::calculateStat()
-{
-  TransferStat stat;
-  if(lastTransferStatMapUpdated_.differenceInMillis(global::wallclock())+
-     A2_DELTA_MILLIS >= 250) {
-    A2_LOG_DEBUG("Updating TransferStat of PeerStorage");
-    lastTransferStatMapUpdated_ = global::wallclock();
-    peerTransferStatMap_.clear();
-    std::vector<SharedHandle<Peer> > activePeers;
-    getActivePeers(activePeers);
-    for(std::vector<SharedHandle<Peer> >::const_iterator i =
-          activePeers.begin(), eoi = activePeers.end(); i != eoi; ++i) {
-      TransferStat s;
-      s.downloadSpeed = (*i)->calculateDownloadSpeed();
-      s.uploadSpeed = (*i)->calculateUploadSpeed();
-      s.sessionDownloadLength = (*i)->getSessionDownloadLength();
-      s.sessionUploadLength = (*i)->getSessionUploadLength();
-
-      peerTransferStatMap_[(*i)->getID()] = calculateStatFor(*i);
-      stat += s;
-    }
-    cachedTransferStat_ = stat;
-  } else {
-    stat = cachedTransferStat_;
-  }
-  stat.sessionDownloadLength += removedPeerSessionDownloadLength_;
-  stat.sessionUploadLength += removedPeerSessionUploadLength_;
-  stat.setAllTimeUploadLength(btRuntime_->getUploadLengthAtStartup()+
-                              stat.getSessionUploadLength());
-  return stat;
-}
-
-void DefaultPeerStorage::updateTransferStatFor(const SharedHandle<Peer>& peer)
-{
-  A2_LOG_DEBUG(fmt("Updating TransferStat for peer %s", peer->getID().c_str()));
-  std::map<std::string, TransferStat>::iterator itr =
-    peerTransferStatMap_.find(peer->getID());
-  if(itr == peerTransferStatMap_.end()) {
-    return;
-  }
-  cachedTransferStat_ -= (*itr).second;
-  TransferStat s = calculateStatFor(peer);
-  cachedTransferStat_ += s;
-  (*itr).second = s;
-}
-
-TransferStat DefaultPeerStorage::getTransferStatFor
-(const SharedHandle<Peer>& peer)
-{
-  std::map<std::string, TransferStat>::const_iterator itr =
-    peerTransferStatMap_.find(peer->getID());
-  if(itr == peerTransferStatMap_.end()) {
-    return TransferStat();
-  } else {
-    return (*itr).second;
-  }
-}
-
 bool DefaultPeerStorage::isBadPeer(const std::string& ipaddr)
 {
   std::map<std::string, time_t>::iterator i = badPeers_.find(ipaddr);
@@ -365,11 +293,6 @@ void DefaultPeerStorage::onErasingPeer(const SharedHandle<Peer>& peer) {}
 void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer)
 {
   if(peer->isActive()) {
-    TransferStat removedStat(calculateStatFor(peer));
-    removedPeerSessionDownloadLength_ += removedStat.getSessionDownloadLength();
-    removedPeerSessionUploadLength_ += removedStat.getSessionUploadLength();
-    cachedTransferStat_ -= removedStat;
-
     if(peer->isDisconnectedGracefully() && !peer->isIncomingPeer()) {
       peer->startBadCondition();
       addDroppedPeer(peer);

src/DefaultPeerStorage.h

@@ -56,18 +56,12 @@ private:
   size_t maxPeerListSize_;
   std::deque<SharedHandle<Peer> > peers_;
   std::deque<SharedHandle<Peer> > droppedPeers_;
-  int64_t removedPeerSessionDownloadLength_;
-  int64_t removedPeerSessionUploadLength_;
 
   BtSeederStateChoke* seederStateChoke_;
   BtLeecherStateChoke* leecherStateChoke_;
 
-  std::map<std::string, TransferStat> peerTransferStatMap_;
-
   Timer lastTransferStatMapUpdated_;
 
-  TransferStat cachedTransferStat_;
-
   std::map<std::string, time_t> badPeers_;
   Timer lastBadPeerCleaned_;
 
@@ -97,12 +91,6 @@ public:
 
   virtual void getActivePeers(std::vector<SharedHandle<Peer> >& peers);
 
-  virtual TransferStat calculateStat();
-
-  virtual void updateTransferStatFor(const SharedHandle<Peer>& peer);
-
-  virtual TransferStat getTransferStatFor(const SharedHandle<Peer>& peer);
-
   virtual bool isBadPeer(const std::string& ipaddr);
 
   virtual void addBadPeer(const std::string& ipaddr);

src/DownloadCommand.cc

@@ -176,6 +176,7 @@ bool DownloadCommand::executeInternal() {
     }
     getSocketRecvBuffer()->shiftBuffer(bufSize);
     peerStat_->updateDownloadLength(bufSize);
+    getDownloadContext()->updateDownloadLength(bufSize);
   }
   bool segmentPartComplete = false;
   // Note that GrowSegment::complete() always returns false.

src/DownloadContext.cc

@@ -43,6 +43,7 @@
 #include "DlAbortEx.h"
 #include "a2functional.h"
 #include "Signature.h"
+#include "RequestGroupMan.h"
 
 namespace aria2 {
 
@@ -52,8 +53,7 @@ DownloadContext::DownloadContext():
   knowsTotalLength_(true),
   ownerRequestGroup_(0),
   attrs_(MAX_CTX_ATTR),
-  downloadStartTime_(0),
-  downloadStopTime_(downloadStartTime_),
+  downloadStopTime_(0),
   acceptMetalink_(true) {}
 
 DownloadContext::DownloadContext(int32_t pieceLength,
@@ -64,7 +64,6 @@ DownloadContext::DownloadContext(int32_t pieceLength,
   knowsTotalLength_(true),
   ownerRequestGroup_(0),
   attrs_(MAX_CTX_ATTR),
-  downloadStartTime_(0),
   downloadStopTime_(0),
   acceptMetalink_(true)
 {
@@ -76,23 +75,20 @@ DownloadContext::~DownloadContext() {}
 
 void DownloadContext::resetDownloadStartTime()
 {
-  downloadStartTime_ = global::wallclock();
   downloadStopTime_.reset(0);
+  netStat_.downloadStart();
 }
 
 void DownloadContext::resetDownloadStopTime()
 {
   downloadStopTime_ = global::wallclock();
+  netStat_.downloadStop();
 }
 
 int64_t DownloadContext::calculateSessionTime() const
 {
-  if(downloadStopTime_ > downloadStartTime_) {
-    return
-      downloadStartTime_.differenceInMillis(downloadStopTime_);
-  } else {
-    return 0;
-  }
+  const Timer& startTime = netStat_.getDownloadStartTime();
+  return startTime.differenceInMillis(downloadStopTime_);
 }
 
 SharedHandle<FileEntry>
@@ -283,4 +279,22 @@ void DownloadContext::setSignature(const SharedHandle<Signature>& signature)
   signature_ = signature;
 }
 
+void DownloadContext::updateDownloadLength(size_t bytes)
+{
+  netStat_.updateDownloadLength(bytes);
+  RequestGroupMan* rgman = ownerRequestGroup_->getRequestGroupMan();
+  if(rgman) {
+    rgman->getNetStat().updateDownloadLength(bytes);
+  }
+}
+
+void DownloadContext::updateUploadLength(size_t bytes)
+{
+  netStat_.updateUploadLength(bytes);
+  RequestGroupMan* rgman = ownerRequestGroup_->getRequestGroupMan();
+  if(rgman) {
+    rgman->getNetStat().updateUploadLength(bytes);
+  }
+}
+
 } // namespace aria2

src/DownloadContext.h

@@ -47,6 +47,7 @@
 #include "ValueBase.h"
 #include "SegList.h"
 #include "ContextAttribute.h"
+#include "NetStat.h"
 
 namespace aria2 {
 
@@ -79,7 +80,7 @@ private:
 
   std::vector<SharedHandle<ContextAttribute> > attrs_;
 
-  Timer downloadStartTime_;
+  NetStat netStat_;
 
   Timer downloadStopTime_;
 
@@ -234,6 +235,19 @@ public:
   {
     return acceptMetalink_;
   }
+
+  NetStat& getNetStat()
+  {
+    return netStat_;
+  }
+
+  // This method also updates global download length held by
+  // RequestGroupMan via getOwnerRequestGroup().
+  void updateDownloadLength(size_t bytes);
+
+  // This method also updates global upload length held by
+  // RequestGroupMan via getOwnerRequestGroup().
+  void updateUploadLength(size_t bytes);
 };
 
 } // namespace aria2

src/DownloadEngine.cc

@@ -220,7 +220,6 @@ void DownloadEngine::onEndOfRun()
 
 void DownloadEngine::afterEachIteration()
 {
-  requestGroupMan_->calculateStat();
   if(global::globalHaltRequested == 1) {
     A2_LOG_NOTICE(_("Shutdown sequence commencing..."
                     " Press Ctrl-C again for emergency shutdown."));

src/Makefile.am

@@ -58,6 +58,7 @@ SRCS =  Socket.h\
 	DownloadEngineFactory.cc DownloadEngineFactory.h\
 	SpeedCalc.cc SpeedCalc.h\
 	PeerStat.cc PeerStat.h\
+	NetStat.cc NetStat.h\
 	BitfieldMan.cc BitfieldMan.h\
 	Randomizer.h\
 	SimpleRandomizer.cc SimpleRandomizer.h\

src/MultiUrlRequestInfo.cc

@@ -239,6 +239,7 @@ error_code::Value MultiUrlRequestInfo::execute()
     util::setGlobalSignalHandler(SIGINT, handler, 0);
     util::setGlobalSignalHandler(SIGTERM, handler, 0);
 
+    e->getRequestGroupMan()->getNetStat().downloadStart();
     e->run();
 
     if(!option_->blank(PREF_SAVE_COOKIES)) {

src/NetStat.cc

@@ -0,0 +1,126 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2012 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "NetStat.h"
+#include "wallclock.h"
+
+namespace aria2 {
+
+NetStat::NetStat()
+  : status_(NetStat::IDLE),
+    avgDownloadSpeed_(0),
+    avgUploadSpeed_(0),
+    sessionDownloadLength_(0),
+    sessionUploadLength_(0)
+{}
+
+NetStat::~NetStat() {}
+
+/**
+ * Returns current download speed in byte per sec.
+ */
+int NetStat::calculateDownloadSpeed()
+{
+  return downloadSpeed_.calculateSpeed();
+}
+
+int NetStat::calculateAvgDownloadSpeed()
+{
+  return avgDownloadSpeed_ = downloadSpeed_.calculateAvgSpeed();
+}
+
+int NetStat::calculateUploadSpeed()
+{
+  return uploadSpeed_.calculateSpeed();
+}
+
+int NetStat::calculateAvgUploadSpeed()
+{
+  return avgUploadSpeed_ = uploadSpeed_.calculateAvgSpeed();
+}
+
+void NetStat::updateDownloadLength(size_t bytes)
+{
+  downloadSpeed_.update(bytes);
+  sessionDownloadLength_ += bytes;
+}
+
+void NetStat::updateUploadLength(size_t bytes)
+{
+  uploadSpeed_.update(bytes);
+  sessionUploadLength_ += bytes;
+}
+
+int NetStat::getMaxDownloadSpeed() const
+{
+  return downloadSpeed_.getMaxSpeed();
+}
+
+int NetStat::getMaxUploadSpeed() const
+{
+  return uploadSpeed_.getMaxSpeed();
+}
+
+void NetStat::reset()
+{
+  downloadSpeed_.reset();
+  uploadSpeed_.reset();
+  downloadStartTime_ = global::wallclock();
+  status_ = IDLE;
+}
+
+void NetStat::downloadStart()
+{
+  reset();
+  status_ = ACTIVE;
+}
+
+void NetStat::downloadStop()
+{
+  calculateAvgDownloadSpeed();
+  calculateAvgUploadSpeed();
+  status_ = IDLE;
+}
+
+TransferStat NetStat::toTransferStat()
+{
+  TransferStat stat;
+  stat.downloadSpeed = calculateDownloadSpeed();
+  stat.uploadSpeed = calculateUploadSpeed();
+  stat.sessionDownloadLength = getSessionDownloadLength();
+  stat.sessionUploadLength = getSessionUploadLength();
+  return stat;
+}
+
+} // namespace aria2

src/NetStat.h

@@ -0,0 +1,133 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2012 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#ifndef D_NET_STAT_H
+#define D_NET_STAT_H
+
+#include "common.h"
+
+#include "SpeedCalc.h"
+#include "TransferStat.h"
+
+namespace aria2 {
+
+class NetStat {
+public:
+  enum STATUS {
+    IDLE,
+    ACTIVE,
+  };
+
+  NetStat();
+  ~NetStat();
+
+  // Don't allow copying
+  NetStat(const NetStat&);
+  NetStat& operator=(const NetStat&);
+
+  /**
+   * Returns current download speed in byte per sec.
+   */
+  int calculateDownloadSpeed();
+
+  int calculateAvgDownloadSpeed();
+
+  int calculateUploadSpeed();
+
+  int calculateAvgUploadSpeed();
+
+  void updateDownloadLength(size_t bytes);
+
+  void updateUploadLength(size_t bytes);
+
+  int getMaxDownloadSpeed() const;
+
+  int getMaxUploadSpeed() const;
+
+  int getAvgDownloadSpeed() const
+  {
+    return avgDownloadSpeed_;
+  }
+
+  int getAvgUploadSpeed() const
+  {
+    return avgUploadSpeed_;
+  }
+
+  void reset();
+
+  void downloadStart();
+
+  void downloadStop();
+
+  const Timer& getDownloadStartTime() const
+  {
+    return downloadStartTime_;
+  }
+
+  STATUS getStatus() const
+  {
+    return status_;
+  }
+
+  uint64_t getSessionDownloadLength() const
+  {
+    return sessionDownloadLength_;
+  }
+
+  uint64_t getSessionUploadLength() const
+  {
+    return sessionUploadLength_;
+  }
+
+  void addSessionDownloadLength(uint64_t length)
+  {
+    sessionDownloadLength_ += length;
+  }
+
+  TransferStat toTransferStat();
+private:
+  SpeedCalc downloadSpeed_;
+  SpeedCalc uploadSpeed_;
+  Timer downloadStartTime_;
+  STATUS status_;
+  int avgDownloadSpeed_;
+  int avgUploadSpeed_;
+  int64_t sessionDownloadLength_;
+  int64_t sessionUploadLength_;
+};
+
+} // namespace aria2
+
+#endif // D_NET_STAT_H

src/Peer.cc

@@ -77,7 +77,7 @@ void Peer::allocateSessionResource(int32_t pieceLength, int64_t totalLength)
 {
   delete res_;
   res_ = new PeerSessionResource(pieceLength, totalLength);
-  res_->getPeerStat().downloadStart();
+  res_->getNetStat().downloadStart();
   updateSeeder();
 }
 
@@ -219,13 +219,13 @@ void Peer::updateBitfield(size_t index, int operation) {
 int Peer::calculateUploadSpeed()
 {
   assert(res_);
-  return res_->getPeerStat().calculateUploadSpeed();
+  return res_->getNetStat().calculateUploadSpeed();
 }
 
 int Peer::calculateDownloadSpeed()
 {
   assert(res_);
-  return res_->getPeerStat().calculateDownloadSpeed();
+  return res_->getNetStat().calculateDownloadSpeed();
 }
 
 int64_t Peer::getSessionUploadLength() const

src/PeerSessionResource.cc

@@ -214,23 +214,22 @@ void PeerSessionResource::dhtEnabled(bool b)
 
 int64_t PeerSessionResource::uploadLength() const
 {
-  return peerStat_.getSessionUploadLength();
+  return netStat_.getSessionUploadLength();
 }
 
 void PeerSessionResource::updateUploadLength(int32_t bytes)
 {
-  peerStat_.updateUploadLength(bytes);
+  netStat_.updateUploadLength(bytes);
 }
 
 int64_t PeerSessionResource::downloadLength() const
 {
-  return peerStat_.getSessionDownloadLength();
+  return netStat_.getSessionDownloadLength();
 }
 
 void PeerSessionResource::updateDownloadLength(int32_t bytes)
 {
-  peerStat_.updateDownloadLength(bytes);
-
+  netStat_.updateDownloadLength(bytes);
   lastDownloadUpdate_ = global::wallclock();
 }
 

src/PeerSessionResource.h

@@ -41,7 +41,7 @@
 #include <set>
 
 #include "BtConstants.h"
-#include "PeerStat.h"
+#include "NetStat.h"
 #include "TimerA2.h"
 #include "ExtensionMessageRegistry.h"
 
@@ -58,7 +58,7 @@ private:
   // fast index set which localhost has sent to a peer.
   std::set<size_t> amAllowedIndexSet_;
   ExtensionMessageRegistry extreg_;
-  PeerStat peerStat_;
+  NetStat netStat_;
 
   Timer lastDownloadUpdate_;
 
@@ -206,9 +206,9 @@ public:
 
   void dhtEnabled(bool b);
 
-  PeerStat& getPeerStat()
+  NetStat& getNetStat()
   {
-    return peerStat_;
+    return netStat_;
   }
 
   int64_t uploadLength() const;

src/PeerStat.cc

@@ -33,7 +33,6 @@
  */
 /* copyright --> */
 #include "PeerStat.h"
-#include "SharedHandle.h"
 #include "wallclock.h"
 
 namespace aria2 {
@@ -42,22 +41,11 @@ PeerStat::PeerStat
 (cuid_t cuid, const std::string& hostname, const::std::string& protocol)
   : cuid_(cuid),
     hostname_(hostname),
-    protocol_(protocol),
-    downloadStartTime_(global::wallclock()),
-    status_(PeerStat::IDLE),
-    avgDownloadSpeed_(0),
-    avgUploadSpeed_(0),
-    sessionDownloadLength_(0),
-    sessionUploadLength_(0)
+    protocol_(protocol)
 {}
 
 PeerStat::PeerStat(cuid_t cuid)
-  : cuid_(cuid),
-    status_(PeerStat::IDLE),
-    avgDownloadSpeed_(0),
-    avgUploadSpeed_(0),
-    sessionDownloadLength_(0),
-    sessionUploadLength_(0)
+  : cuid_(cuid)
 {}
 
 PeerStat::~PeerStat() {}
@@ -67,72 +55,97 @@ PeerStat::~PeerStat() {}
  */
 int PeerStat::calculateDownloadSpeed()
 {
-  return downloadSpeed_.calculateSpeed();
+  return netStat_.calculateDownloadSpeed();
 }
 
 int PeerStat::calculateAvgDownloadSpeed()
 {
-  avgDownloadSpeed_ = downloadSpeed_.calculateAvgSpeed();
-  return avgDownloadSpeed_;
+  return netStat_.calculateAvgDownloadSpeed();
 }
 
 int PeerStat::calculateUploadSpeed()
 {
-  return uploadSpeed_.calculateSpeed();
+  return netStat_.calculateUploadSpeed();
 }
 
 int PeerStat::calculateAvgUploadSpeed()
 {
-  avgUploadSpeed_ = uploadSpeed_.calculateAvgSpeed();
-  return avgUploadSpeed_;
+  return netStat_.calculateAvgUploadSpeed();
 }
 
 void PeerStat::updateDownloadLength(size_t bytes)
 {
-  downloadSpeed_.update(bytes);
-  sessionDownloadLength_ += bytes;
+  netStat_.updateDownloadLength(bytes);
 }
 
 void PeerStat::updateUploadLength(size_t bytes)
 {
-  uploadSpeed_.update(bytes);
-  sessionUploadLength_ += bytes;
+  netStat_.updateUploadLength(bytes);
 }
 
 int PeerStat::getMaxDownloadSpeed() const
 {
-  return downloadSpeed_.getMaxSpeed();
+  return netStat_.getMaxDownloadSpeed();
 }
 
 int PeerStat::getMaxUploadSpeed() const
 {
-  return uploadSpeed_.getMaxSpeed();
+  return netStat_.getMaxUploadSpeed();
+}
+
+int PeerStat::getAvgDownloadSpeed() const
+{
+  return netStat_.getAvgDownloadSpeed();
+}
+
+int PeerStat::getAvgUploadSpeed() const
+{
+  return netStat_.getAvgUploadSpeed();
+}
+
+uint64_t PeerStat::getSessionDownloadLength() const
+{
+  return netStat_.getSessionDownloadLength();
+}
+
+uint64_t PeerStat::getSessionUploadLength() const
+{
+  return netStat_.getSessionUploadLength();
+}
+
+void PeerStat::addSessionDownloadLength(uint64_t length)
+{
+  netStat_.addSessionDownloadLength(length);
+}
+
+const Timer& PeerStat::getDownloadStartTime() const
+{
+  return netStat_.getDownloadStartTime();
+}
+
+NetStat::STATUS PeerStat::getStatus() const
+{
+  return netStat_.getStatus();
 }
 
 void PeerStat::reset()
 {
-  downloadSpeed_.reset();
-  uploadSpeed_.reset();
-  downloadStartTime_ = global::wallclock();
-  status_ = PeerStat::IDLE;
+  netStat_.reset();
 }
 
 void PeerStat::downloadStart()
 {
-  reset();
-  status_ = PeerStat::ACTIVE;
+  netStat_.downloadStart();
 }
 
 void PeerStat::downloadStop()
 {
-  calculateAvgDownloadSpeed();
-  calculateAvgUploadSpeed();
-  status_ = PeerStat::IDLE;
+  netStat_.downloadStop();
 }
 
-bool PeerStat::affectsOverallSpeed() const
+TransferStat PeerStat::toTransferStat()
 {
-  return !downloadSpeed_.isIntervalOver();
+  return netStat_.toTransferStat();
 }
 
 } // namespace aria2

src/PeerStat.h

@@ -39,30 +39,12 @@
 
 #include <string>
 
-#include "SpeedCalc.h"
-#include "SharedHandle.h"
 #include "Command.h"
+#include "NetStat.h"
 
 namespace aria2 {
 
 class PeerStat {
-public:
-  enum STATUS {
-    IDLE,
-    ACTIVE,
-  };
-private:
-  cuid_t cuid_;
-  std::string hostname_;
-  std::string protocol_;
-  SpeedCalc downloadSpeed_;
-  SpeedCalc uploadSpeed_;
-  Timer downloadStartTime_;
-  PeerStat::STATUS status_;
-  int avgDownloadSpeed_;
-  int avgUploadSpeed_;
-  int64_t sessionDownloadLength_;
-  int64_t sessionUploadLength_;
 public:
   PeerStat
   (cuid_t cuid, const std::string& hostname, const::std::string& protocol);
@@ -94,15 +76,9 @@ public:
 
   int getMaxUploadSpeed() const;
 
-  int getAvgDownloadSpeed() const
-  {
-    return avgDownloadSpeed_;
-  }
+  int getAvgDownloadSpeed() const;
 
-  int getAvgUploadSpeed() const
-  {
-    return avgUploadSpeed_;
-  }
+  int getAvgUploadSpeed() const;
 
   void reset();
 
@@ -110,15 +86,17 @@ public:
 
   void downloadStop();
 
-  const Timer& getDownloadStartTime() const
-  {
-    return downloadStartTime_;
-  }
+  const Timer& getDownloadStartTime() const;
 
-  PeerStat::STATUS getStatus() const
-  {
-    return status_;
-  }
+  NetStat::STATUS getStatus() const;
+
+  uint64_t getSessionDownloadLength() const;
+
+  uint64_t getSessionUploadLength() const;
+
+  void addSessionDownloadLength(uint64_t length);
+
+  TransferStat toTransferStat();
 
   cuid_t getCuid() const
   {
@@ -134,25 +112,11 @@ public:
   {
     return protocol_;
   }
-
-  uint64_t getSessionDownloadLength() const
-  {
-    return sessionDownloadLength_;
-  }
-
-  uint64_t getSessionUploadLength() const
-  {
-    return sessionUploadLength_;
-  }
-
-  void addSessionDownloadLength(uint64_t length)
-  {
-    sessionDownloadLength_ += length;
-  }
-
-  // Returns true if the download speed of this object still affects
-  // overall download speed statistics.
-  bool affectsOverallSpeed() const;
+private:
+  cuid_t cuid_;
+  std::string hostname_;
+  std::string protocol_;
+  NetStat netStat_;
 };
 
 } // namespace aria2

src/PeerStorage.h

@@ -94,15 +94,6 @@ public:
    */
   virtual void getActivePeers(std::vector<SharedHandle<Peer> >& peers) = 0;
 
-  /**
-   * Calculates current download/upload statistics.
-   */
-  virtual TransferStat calculateStat() = 0;
-
-  virtual void updateTransferStatFor(const SharedHandle<Peer>& peer) = 0;
-
-  virtual TransferStat getTransferStatFor(const SharedHandle<Peer>& peer) = 0;
-
   /**
    * Returns true if peer with ipaddr should be ignored because, for
    * example, it sends bad data.

src/RequestGroup.cc

@@ -963,22 +963,15 @@ void RequestGroup::decreaseNumCommand()
   }
 }
 
-
 TransferStat RequestGroup::calculateStat() const
 {
-  TransferStat stat;
+  TransferStat stat = downloadContext_->getNetStat().toTransferStat();
 #ifdef ENABLE_BITTORRENT
-  if(peerStorage_) {
-    stat = peerStorage_->calculateStat();
+  if(btRuntime_) {
+    stat.allTimeUploadLength = btRuntime_->getUploadLengthAtStartup()+
+      stat.sessionUploadLength;
   }
 #endif // ENABLE_BITTORRENT
-  if(segmentMan_) {
-    stat.setDownloadSpeed
-      (stat.getDownloadSpeed()+segmentMan_->calculateDownloadSpeed());
-    stat.setSessionDownloadLength
-      (stat.getSessionDownloadLength()+
-       segmentMan_->calculateSessionDownloadLength());
-  }
   return stat;
 }
 
@@ -1242,8 +1235,7 @@ void RequestGroup::increaseAndValidateFileNotFoundCount()
   ++fileNotFoundCount_;
   const int maxCount = option_->getAsInt(PREF_MAX_FILE_NOT_FOUND);
   if(maxCount > 0 && fileNotFoundCount_ >= maxCount &&
-     (!segmentMan_ ||
-      segmentMan_->calculateSessionDownloadLength() == 0)) {
+     downloadContext_->getNetStat().getSessionDownloadLength() == 0) {
     throw DOWNLOAD_FAILURE_EXCEPTION2
       (fmt("Reached max-file-not-found count=%d", maxCount),
        error_code::MAX_FILE_NOT_FOUND);

src/RequestGroup.h

@@ -514,6 +514,11 @@ public:
     requestGroupMan_ = requestGroupMan;
   }
 
+  RequestGroupMan* getRequestGroupMan()
+  {
+    return requestGroupMan_;
+  }
+
   int getResumeFailureCount() const
   {
     return resumeFailureCount_;

src/RequestGroupMan.cc

@@ -54,7 +54,6 @@
 #include "DownloadContext.h"
 #include "ServerStatMan.h"
 #include "ServerStat.h"
-#include "PeerStat.h"
 #include "SegmentMan.h"
 #include "FeedbackURISelector.h"
 #include "InorderURISelector.h"
@@ -918,12 +917,8 @@ void RequestGroupMan::forceHalt()
 
 TransferStat RequestGroupMan::calculateStat()
 {
-  TransferStat s;
-  for(std::deque<SharedHandle<RequestGroup> >::const_iterator i =
-        requestGroups_.begin(), eoi = requestGroups_.end(); i != eoi; ++i) {
-    s += (*i)->calculateStat();
-  }
-  return s;
+  // TODO Currently, all time upload length is not set.
+  return netStat_.toTransferStat();
 }
 
 SharedHandle<DownloadResult>
@@ -1033,13 +1028,13 @@ void RequestGroupMan::removeStaleServerStat(time_t timeout)
 bool RequestGroupMan::doesOverallDownloadSpeedExceed()
 {
   return maxOverallDownloadSpeedLimit_ > 0 &&
-    maxOverallDownloadSpeedLimit_ < calculateStat().getDownloadSpeed();
+    maxOverallDownloadSpeedLimit_ < netStat_.calculateDownloadSpeed();
 }
 
 bool RequestGroupMan::doesOverallUploadSpeedExceed()
 {
   return maxOverallUploadSpeedLimit_ > 0 &&
-    maxOverallUploadSpeedLimit_ < calculateStat().getUploadSpeed();
+    maxOverallUploadSpeedLimit_ < netStat_.calculateUploadSpeed();
 }
 
 void RequestGroupMan::getUsedHosts

src/RequestGroupMan.h

@@ -46,6 +46,7 @@
 #include "DownloadResult.h"
 #include "TransferStat.h"
 #include "RequestGroup.h"
+#include "NetStat.h"
 
 namespace aria2 {
 
@@ -75,6 +76,8 @@ private:
 
   int maxOverallUploadSpeedLimit_;
 
+  NetStat netStat_;
+
   // true if JSON-RPC/XML-RPC is enabled.
   bool rpc_;
 
@@ -333,6 +336,11 @@ public:
   }
 
   void setUriListParser(const SharedHandle<UriListParser>& uriListParser);
+
+  NetStat& getNetStat()
+  {
+    return netStat_;
+  }
 };
 
 } // namespace aria2

src/RpcMethodImpl.cc

@@ -796,9 +796,10 @@ void gatherPeer
                    util::toHex((*i)->getBitfield(), (*i)->getBitfieldLength()));
     peerEntry->put(KEY_AM_CHOKING, (*i)->amChoking()?VLB_TRUE:VLB_FALSE);
     peerEntry->put(KEY_PEER_CHOKING, (*i)->peerChoking()?VLB_TRUE:VLB_FALSE);
-    TransferStat stat = ps->getTransferStatFor(*i);
-    peerEntry->put(KEY_DOWNLOAD_SPEED, util::itos(stat.getDownloadSpeed()));
-    peerEntry->put(KEY_UPLOAD_SPEED, util::itos(stat.getUploadSpeed()));
+    peerEntry->put(KEY_DOWNLOAD_SPEED,
+                   util::itos((*i)->calculateDownloadSpeed()));
+    peerEntry->put(KEY_UPLOAD_SPEED,
+                   util::itos((*i)->calculateUploadSpeed()));
     peerEntry->put(KEY_SEEDER, (*i)->isSeeder()?VLB_TRUE:VLB_FALSE);
     peers->append(peerEntry);
   }

src/SegmentMan.cc

@@ -237,7 +237,7 @@ SharedHandle<Segment> SegmentMan::getCleanSegmentIfOwnerIsIdle
       }
       cuid_t owner = segmentEntry->cuid;
       SharedHandle<PeerStat> ps = getPeerStat(owner);
-      if(!ps || ps->getStatus() == PeerStat::IDLE) {
+      if(!ps || ps->getStatus() == NetStat::IDLE) {
         cancelSegment(owner);
         return getSegmentWithIndex(cuid, index);
       } else {
@@ -395,36 +395,6 @@ void SegmentMan::updateFastestPeerStat(const SharedHandle<PeerStat>& peerStat)
   }
 }
 
-int SegmentMan::calculateDownloadSpeed()
-{
-  int speed = 0;
-  for(std::vector<SharedHandle<PeerStat> >::const_iterator i =
-        peerStats_.begin(), eoi = peerStats_.end(); i != eoi; ++i) {
-    // PeerStat which is IDLE but its last download speed calculation
-    // interval is not over must be added to the result.
-    if((*i)->getStatus() == PeerStat::ACTIVE || (*i)->affectsOverallSpeed()) {
-      speed += (*i)->calculateDownloadSpeed();
-    }
-  }
-  return speed;
-}
-
-namespace {
-class PeerStatDownloadLengthOperator {
-public:
-  int64_t operator()(int64_t total, const SharedHandle<PeerStat>& ps)
-  {
-    return ps->getSessionDownloadLength()+total;
-  }
-};
-} // namespace
-
-int64_t SegmentMan::calculateSessionDownloadLength() const
-{
-  return std::accumulate(fastestPeerStats_.begin(), fastestPeerStats_.end(),
-                         0LL, PeerStatDownloadLengthOperator());
-}
-
 size_t SegmentMan::countFreePieceFrom(size_t index) const
 {
   size_t numPieces = downloadContext_->getNumPieces();

src/SegmentMan.h

@@ -220,16 +220,6 @@ public:
     return fastestPeerStats_;
   }
 
-  /**
-   * Returns current download speed in bytes per sec.
-   */
-  int calculateDownloadSpeed();
-
-  /**
-   * Returns the downloaded bytes in this session.
-   */
-  int64_t calculateSessionDownloadLength() const;
-
   size_t countFreePieceFrom(size_t index) const;
 
   // Excludes segments that fileEntry covers from segment selection.

src/ShareRatioSeedCriteria.cc

@@ -34,7 +34,7 @@
 /* copyright --> */
 #include "ShareRatioSeedCriteria.h"
 #include "DownloadContext.h"
-#include "PeerStorage.h"
+#include "BtRuntime.h"
 #include "PieceStorage.h"
 
 namespace aria2 {
@@ -55,15 +55,16 @@ bool ShareRatioSeedCriteria::evaluate()
   if(completedLength == 0) {
     return true;
   }
-  TransferStat stat = peerStorage_->calculateStat();
-  return ratio_ <= 1.0*stat.getAllTimeUploadLength()/completedLength;
+  int64_t uploadLength = btRuntime_->getUploadLengthAtStartup()+
+    downloadContext_->getNetStat().getSessionUploadLength();
+  return ratio_ <= 1.0*uploadLength/completedLength;
 }
 
 
-void ShareRatioSeedCriteria::setPeerStorage
-(const SharedHandle<PeerStorage>& peerStorage)
+void ShareRatioSeedCriteria::setBtRuntime
+(const SharedHandle<BtRuntime>& btRuntime)
 {
-  peerStorage_ = peerStorage;
+  btRuntime_ = btRuntime;
 }
 
 void ShareRatioSeedCriteria::setPieceStorage

src/ShareRatioSeedCriteria.h

@@ -40,14 +40,14 @@
 namespace aria2 {
 
 class DownloadContext;
-class PeerStorage;
+class BtRuntime;
 class PieceStorage;
 
 class ShareRatioSeedCriteria : public SeedCriteria {
 private:
   double ratio_;
   SharedHandle<DownloadContext> downloadContext_;
-  SharedHandle<PeerStorage> peerStorage_;
+  SharedHandle<BtRuntime> btRuntime_;
   SharedHandle<PieceStorage> pieceStorage_;
 public:
   ShareRatioSeedCriteria
@@ -67,7 +67,7 @@ public:
     return ratio_;
   }
 
-  void setPeerStorage(const SharedHandle<PeerStorage>& peerStorage);
+  void setBtRuntime(const SharedHandle<BtRuntime>& btRuntime);
 
   void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage);
 };

test/DefaultBtAnnounceTest.cc

@@ -60,6 +60,8 @@ public:
     SharedHandle<TorrentAttribute> torrentAttrs(new TorrentAttribute());
     torrentAttrs->infoHash = std::string(vbegin(infoHash), vend(infoHash));
     dctx_->setAttribute(CTX_ATTR_BT, torrentAttrs);
+    dctx_->getNetStat().updateDownloadLength(pieceLength*5);
+    dctx_->getNetStat().updateUploadLength(pieceLength*6);
     bittorrent::setStaticPeerId(peerId);
 
     pieceStorage_.reset(new MockPieceStorage());
@@ -67,11 +69,6 @@ public:
     pieceStorage_->setCompletedLength(pieceLength*10);
 
     peerStorage_.reset(new MockPeerStorage());
-    TransferStat stat;
-    stat.setSessionDownloadLength(pieceLength*5);
-    stat.setSessionUploadLength(pieceLength*6);
-    peerStorage_->setStat(stat);
-
     btRuntime_.reset(new BtRuntime());
   }
 

test/DefaultBtMessageDispatcherTest.cc

@@ -180,10 +180,6 @@ void DefaultBtMessageDispatcherTest::testAddMessage() {
 }
 
 void DefaultBtMessageDispatcherTest::testSendMessages() {
-  TransferStat stat;
-  stat.setUploadSpeed(0);
-  peerStorage->setStat(stat);
-
   SharedHandle<MockBtMessage2> msg1(new MockBtMessage2());
   msg1->setSendingInProgress(false);
   msg1->setUploading(false);
@@ -199,10 +195,6 @@ void DefaultBtMessageDispatcherTest::testSendMessages() {
 }
 
 void DefaultBtMessageDispatcherTest::testSendMessages_underUploadLimit() {
-  TransferStat stat;
-  stat.setUploadSpeed(0);
-  peerStorage->setStat(stat);
-
   SharedHandle<MockBtMessage2> msg1(new MockBtMessage2());
   msg1->setSendingInProgress(false);
   msg1->setUploading(true);

test/DefaultBtProgressInfoFileTest.cc

@@ -211,12 +211,11 @@ void DefaultBtProgressInfoFileTest::testSave()
   initializeMembers(1024, 81920);
 
   dctx_->setBasePath(A2_TEST_OUT_DIR"/save-temp");
+  dctx_->getNetStat().updateUploadLength(768);
+  btRuntime_->setUploadLengthAtStartup(256);
   bitfield_->setAllBit();
   bitfield_->unsetBit(79);
   pieceStorage_->setCompletedLength(80896);
-  TransferStat stat;
-  stat.setAllTimeUploadLength(1024);
-  peerStorage_->setStat(stat);
 
   SharedHandle<Piece> p1(new Piece(1, 1024));
   SharedHandle<Piece> p2(new Piece(2, 512));

test/MockPeerStorage.h

@@ -11,7 +11,6 @@ namespace aria2 {
 
 class MockPeerStorage : public PeerStorage {
 private:
-  TransferStat stat;
   std::deque<SharedHandle<Peer> > peers;
   std::deque<SharedHandle<Peer> > droppedPeers;
   std::vector<SharedHandle<Peer> > activePeers;
@@ -63,14 +62,6 @@ public:
     peers.insert(peers.end(), activePeers.begin(), activePeers.end());
   }
 
-  virtual TransferStat calculateStat() {
-    return stat;
-  }
-
-  void setStat(const TransferStat& stat) {
-    this->stat = stat;
-  }
-
   virtual bool isBadPeer(const std::string& ipaddr)
   {
     return false;
@@ -94,13 +85,6 @@ public:
     ++numChokeExecuted_;
   }
 
-  virtual void updateTransferStatFor(const SharedHandle<Peer>& peer) {}
-
-  virtual TransferStat getTransferStatFor(const SharedHandle<Peer>& peer)
-  {
-    return TransferStat();
-  }
-
   int getNumChokeExecuted() const
   {
     return numChokeExecuted_;

test/ShareRatioSeedCriteriaTest.cc

@@ -3,7 +3,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "DownloadContext.h"
-#include "MockPeerStorage.h"
+#include "BtRuntime.h"
 #include "MockPieceStorage.h"
 #include "FileEntry.h"
 
@@ -24,16 +24,14 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ShareRatioSeedCriteriaTest);
 
 void ShareRatioSeedCriteriaTest::testEvaluate() {
   SharedHandle<DownloadContext> dctx(new DownloadContext(1024*1024, 1000000));
-  SharedHandle<MockPeerStorage> peerStorage(new MockPeerStorage());
-  TransferStat stat;
-  stat.setAllTimeUploadLength(1000000);
-  peerStorage->setStat(stat);
+  SharedHandle<BtRuntime> btRuntime(new BtRuntime());
+  btRuntime->setUploadLengthAtStartup(1000000);
 
   SharedHandle<MockPieceStorage> pieceStorage(new MockPieceStorage());
   pieceStorage->setCompletedLength(1000000);
 
   ShareRatioSeedCriteria cri(1.0, dctx);
-  cri.setPeerStorage(peerStorage);
+  cri.setBtRuntime(btRuntime);
   cri.setPieceStorage(pieceStorage);
 
   CPPUNIT_ASSERT(cri.evaluate());