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

2009-11-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Removed redundant DownloadContext::hasAttribute(...) calls.
	* src/ConsoleStatCalc.cc
	* src/RequestGroup.cc
	* src/XmlRpcMethodImpl.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-11-26 13:16:02 +00:00
parent 8ab55abf11
commit 52f11b5a21
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-11-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed redundant DownloadContext::hasAttribute(...) calls.
* src/ConsoleStatCalc.cc
* src/RequestGroup.cc
* src/XmlRpcMethodImpl.cc
2009-11-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Changed the number of tracker request attempt from 5 to 2.

6
src/ConsoleStatCalc.cc
View File

@ -115,9 +115,9 @@ static void printProgress
<< "CN:"
<< rg->getNumConnection();
#ifdef ENABLE_BITTORRENT
if(rg->getDownloadContext()->hasAttribute(bittorrent::BITTORRENT)) {
SharedHandle<PeerStorage> ps =
e->getBtRegistry()->get(rg->getGID())._peerStorage;
SharedHandle<PeerStorage> ps =
e->getBtRegistry()->get(rg->getGID())._peerStorage;
if(!ps.isNull()) {
std::deque<SharedHandle<Peer> > peers;
ps->getActivePeers(peers);
o << " " << "SEED:"

4
src/RequestGroup.cc
View File

@ -773,9 +773,7 @@ void RequestGroup::setForceHaltRequested(bool f, HaltReason haltReason)
void RequestGroup::releaseRuntimeResource(DownloadEngine* e)
{
#ifdef ENABLE_BITTORRENT
if(_downloadContext->hasAttribute(bittorrent::BITTORRENT)) {
e->getBtRegistry()->remove(_gid);
}
e->getBtRegistry()->remove(_gid);
#endif // ENABLE_BITTORRENT
if(!_pieceStorage.isNull()) {
_pieceStorage->removeAdvertisedPiece(0);

10
src/XmlRpcMethodImpl.cc
View File

@ -464,12 +464,10 @@ BDE GetPeersXmlRpcMethod::process
(StringFormat("No peer data is available for GID#%d", gid).str());
}
BDE peers = BDE::list();
if(group->getDownloadContext()->hasAttribute(bittorrent::BITTORRENT)) {
BtObject btObject = e->getBtRegistry()->get(group->getGID());
if(!btObject.isNull()) {
assert(!btObject._peerStorage.isNull());
gatherPeer(peers, btObject._peerStorage);
}
BtObject btObject = e->getBtRegistry()->get(group->getGID());
if(!btObject.isNull()) {
assert(!btObject._peerStorage.isNull());
gatherPeer(peers, btObject._peerStorage);
}
return peers;
}