diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-04-05 10:38:15 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-04-05 10:38:15 +0000 |
| commit | becd34bcb9eae1aecd6b1ec2a79f8990aee04ec6 (patch) | |
| tree | 9b6c22edebc9a0f671062e78c99252a3219f9a7d /src/DefaultPeerStorage.cc | |
| parent | 88318194070be9b14ee2295919c2c211b7fd501d (diff) | |
2009-04-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed the bug that removed peer's session upload/download length
are counted twice in _cachedTransferStat before it is
re-calculated. This affected the calculation of shara ratio,
resulting aria2 wrongly determines that specified share ratio is
reached. Also fixed the typo in calculateStatFor function name.
* src/BtSetup.cc
* src/DefaultPeerStorage.cc
* src/ShareRatioSeedCriteria.h
* test/ShareRatioSeedCriteriaTest.cc
Diffstat (limited to 'src/DefaultPeerStorage.cc')
| -rw-r--r-- | src/DefaultPeerStorage.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc index c13f6b41..a8e8df8e 100644 --- a/src/DefaultPeerStorage.cc +++ b/src/DefaultPeerStorage.cc @@ -192,7 +192,7 @@ void DefaultPeerStorage::getActivePeers(std::deque<SharedHandle<Peer> >& activeP std::for_each(peers.begin(), peers.end(), CollectActivePeer(activePeers)); } -static TransferStat caluclateStatFor(const SharedHandle<Peer>& peer) +static TransferStat calculateStatFor(const SharedHandle<Peer>& peer) { struct timeval now; gettimeofday(&now, 0); @@ -223,7 +223,7 @@ TransferStat DefaultPeerStorage::calculateStat() s.sessionDownloadLength = (*i)->getSessionDownloadLength(); s.sessionUploadLength = (*i)->getSessionUploadLength(); - _peerTransferStatMap[(*i)->getID()] = caluclateStatFor(*i); + _peerTransferStatMap[(*i)->getID()] = calculateStatFor(*i); stat += s; } _cachedTransferStat = stat; @@ -240,8 +240,8 @@ TransferStat DefaultPeerStorage::calculateStat() void DefaultPeerStorage::updateTransferStatFor(const SharedHandle<Peer>& peer) { logger->debug("Updating TransferStat for peer %s", peer->getID().c_str()); - _cachedTransferStat = _cachedTransferStat-_peerTransferStatMap[peer->getID()]; - TransferStat s = caluclateStatFor(peer); + _cachedTransferStat -= _peerTransferStatMap[peer->getID()]; + TransferStat s = calculateStatFor(peer); _cachedTransferStat += s; _peerTransferStatMap[peer->getID()] = s; } @@ -266,8 +266,11 @@ void DefaultPeerStorage::onErasingPeer(const SharedHandle<Peer>& peer) {} void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer) { if(peer->isActive()) { - removedPeerSessionDownloadLength += peer->getSessionDownloadLength(); - removedPeerSessionUploadLength += peer->getSessionUploadLength(); + TransferStat removedStat(calculateStatFor(peer)); + removedPeerSessionDownloadLength += removedStat.getSessionDownloadLength(); + removedPeerSessionUploadLength += removedStat.getSessionUploadLength(); + _cachedTransferStat -= removedStat; + // Execute choking algorithm if unchoked and interested peer is // disconnected. if(!peer->amChoking() && peer->peerInterested()) { |