github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-03-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Cached TransferStat/download speed to avoid to sum them up in
	each call.	
	* src/DefaultPeerStorage.cc
	* src/DefaultPeerStorage.h
	* src/SegmentMan.cc
	* src/SegmentMan.h
pull/1/head
Tatsuhiro Tsujikawa 2009-03-20 13:29:33 +00:00
parent 9233a6258f
commit ef927009b7
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-03-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Cached TransferStat/download speed to avoid to sum them up in each
call.
* src/DefaultPeerStorage.cc
* src/DefaultPeerStorage.h
* src/SegmentMan.cc
* src/SegmentMan.h
2009-03-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-03-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Typedefed cuid_t as int32_t in Command.h Typedefed cuid_t as int32_t in Command.h

13
src/DefaultPeerStorage.cc
View File

@ -224,13 +224,11 @@ TransferStat DefaultPeerStorage::calculateStat()
s.sessionUploadLength = (*i)->getSessionUploadLength(); s.sessionUploadLength = (*i)->getSessionUploadLength();
_peerTransferStatMap[(*i)->getID()] = caluclateStatFor(*i); _peerTransferStatMap[(*i)->getID()] = caluclateStatFor(*i);
stat = stat+s; stat += s;
} }
_cachedTransferStat = stat;
} else { } else {
for(std::map<std::string, TransferStat>::const_iterator i = stat = _cachedTransferStat;
_peerTransferStatMap.begin(); i != _peerTransferStatMap.end(); ++i) {
stat = stat+(*i).second;
}
} }
stat.sessionDownloadLength += removedPeerSessionDownloadLength; stat.sessionDownloadLength += removedPeerSessionDownloadLength;
stat.sessionUploadLength += removedPeerSessionUploadLength; stat.sessionUploadLength += removedPeerSessionUploadLength;
@ -242,7 +240,10 @@ TransferStat DefaultPeerStorage::calculateStat()
void DefaultPeerStorage::updateTransferStatFor(const SharedHandle<Peer>& peer) void DefaultPeerStorage::updateTransferStatFor(const SharedHandle<Peer>& peer)
{ {
logger->debug("Updating TransferStat for peer %s", peer->getID().c_str()); logger->debug("Updating TransferStat for peer %s", peer->getID().c_str());
_peerTransferStatMap[peer->getID()] = caluclateStatFor(peer); _cachedTransferStat = _cachedTransferStat-_peerTransferStatMap[peer->getID()];
TransferStat s = caluclateStatFor(peer);
_cachedTransferStat += s;
_peerTransferStatMap[peer->getID()] = s;
} }
void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) { void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) {

2
src/DefaultPeerStorage.h
View File

@ -69,6 +69,8 @@ private:
Time _lastTransferStatMapUpdated; Time _lastTransferStatMapUpdated;
TransferStat _cachedTransferStat;
bool isPeerAlreadyAdded(const SharedHandle<Peer>& peer); bool isPeerAlreadyAdded(const SharedHandle<Peer>& peer);
public: public:
DefaultPeerStorage(const SharedHandle<BtContext>& btContext, DefaultPeerStorage(const SharedHandle<BtContext>& btContext,

20
src/SegmentMan.cc
View File

@ -65,7 +65,8 @@ SegmentMan::SegmentMan(const Option* option,
logger(LogFactory::getInstance()), logger(LogFactory::getInstance()),
_downloadContext(downloadContext), _downloadContext(downloadContext),
_pieceStorage(pieceStorage), _pieceStorage(pieceStorage),
_lastPeerStatDlspdMapUpdated(0) _lastPeerStatDlspdMapUpdated(0),
_cachedDlspd(0)
{} {}
SegmentMan::~SegmentMan() {} SegmentMan::~SegmentMan() {}
@ -313,19 +314,24 @@ unsigned int SegmentMan::calculateDownloadSpeed()
speed += s; speed += s;
} }
} }
_cachedDlspd = speed;
} else { } else {
for(std::map<cuid_t, unsigned int>::const_iterator i = speed = _cachedDlspd;
_peerStatDlspdMap.begin();
i != _peerStatDlspdMap.end(); ++i) {
speed += (*i).second;
}
} }
return speed; return speed;
} }
void SegmentMan::updateDownloadSpeedFor(const SharedHandle<PeerStat>& pstat) void SegmentMan::updateDownloadSpeedFor(const SharedHandle<PeerStat>& pstat)
{ {
_peerStatDlspdMap[pstat->getCuid()] = pstat->calculateDownloadSpeed(); unsigned int newspd = pstat->calculateDownloadSpeed();
unsigned int oldSpd = _peerStatDlspdMap[pstat->getCuid()];
if(_cachedDlspd > oldSpd) {
_cachedDlspd -= oldSpd;
_cachedDlspd += newspd;
} else {
_cachedDlspd = newspd;
}
_peerStatDlspdMap[pstat->getCuid()] = newspd;
} }
class PeerStatDownloadLengthOperator { class PeerStatDownloadLengthOperator {

2
src/SegmentMan.h
View File

@ -89,6 +89,8 @@ private:
Time _lastPeerStatDlspdMapUpdated; Time _lastPeerStatDlspdMapUpdated;
unsigned int _cachedDlspd;
SharedHandle<Segment> checkoutSegment(cuid_t cuid, SharedHandle<Segment> checkoutSegment(cuid_t cuid,
const SharedHandle<Piece>& piece); const SharedHandle<Piece>& piece);