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

2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Removed resolved TODO1.5
	* src/AbstractCommand.cc
	* src/DownloadCommand.cc
	* src/RequestGroup.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-07-05 09:15:33 +00:00
parent e40d6b7c0f
commit d28a3081f3
4 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed resolved TODO1.5
* src/AbstractCommand.cc
* src/DownloadCommand.cc
* src/RequestGroup.cc
2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Release pooled and in-flight Request objectsand URIResult objects Release pooled and in-flight Request objectsand URIResult objects

2
src/AbstractCommand.cc
View File

@ -283,8 +283,6 @@ void AbstractCommand::onAbort() {
if(!_requestGroup->getPieceStorage().isNull()) { if(!_requestGroup->getPieceStorage().isNull()) {
_requestGroup->getSegmentMan()->cancelSegment(cuid); _requestGroup->getSegmentMan()->cancelSegment(cuid);
} }
// TODO1.5 Should be moved to FileEntry
// _requestGroup->removeIdenticalURI(req->getUrl());
} }
void AbstractCommand::disableReadCheckSocket() { void AbstractCommand::disableReadCheckSocket() {

1
src/DownloadCommand.cc
View File

@ -289,7 +289,6 @@ bool DownloadCommand::prepareForNextSegment() {
if(!tempSegment->complete()) { if(!tempSegment->complete()) {
return prepareForRetry(0); return prepareForRetry(0);
} }
// TODO1.5 get segment for the same file only
SegmentHandle nextSegment = SegmentHandle nextSegment =
_requestGroup->getSegmentMan()->getSegment(cuid, _requestGroup->getSegmentMan()->getSegment(cuid,
tempSegment->getIndex()+1); tempSegment->getIndex()+1);

36
src/RequestGroup.cc
View File

@ -587,42 +587,6 @@ void RequestGroup::createNextCommand(std::deque<Command*>& commands,
DownloadEngine* e, DownloadEngine* e,
unsigned int numCommand) unsigned int numCommand)
{ {
// TODO1.5 The following block should be moved into FileEntry
// if(_option->getAsBool(PREF_REUSE_URI) && _uris.empty()) {
// std::deque<std::string> uris = _spentUris;
// std::sort(uris.begin(), uris.end());
// uris.erase(std::unique(uris.begin(), uris.end()), uris.end());
// std::deque<std::string> errorUris(_uriResults.size());
// std::transform(_uriResults.begin(), _uriResults.end(),
// errorUris.begin(), std::mem_fun_ref(&URIResult::getURI));
// std::sort(errorUris.begin(), errorUris.end());
// errorUris.erase(std::unique(errorUris.begin(), errorUris.end()),
// errorUris.end());
// std::deque<std::string> reusableURIs;
// std::set_difference(uris.begin(), uris.end(),
// errorUris.begin(), errorUris.end(),
// std::back_inserter(reusableURIs));
// size_t ininum = reusableURIs.size();
// _logger->debug("Found %u reusable URIs",
// static_cast<unsigned int>(ininum));
// // Reuse at least _numConcurrentCommand URIs here to avoid to
// // run this process repeatedly.
// if(ininum > 0 && ininum < _numConcurrentCommand) {
// _logger->debug("fewer than _numConcurrentCommand=%u",
// _numConcurrentCommand);
// for(size_t i = 0; i < _numConcurrentCommand/ininum; ++i) {
// _uris.insert(_uris.end(), reusableURIs.begin(), reusableURIs.end());
// }
// _uris.insert(_uris.end(), reusableURIs.begin(),
// reusableURIs.begin()+(_numConcurrentCommand%ininum));
// _logger->debug("Duplication complete: now %u URIs for reuse",
// static_cast<unsigned int>(_uris.size()));
// }
// }
// std::deque<std::string> pendingURIs;
for(; numCommand--; ) { for(; numCommand--; ) {
Command* command = new CreateRequestCommand(e->newCUID(), this, e); Command* command = new CreateRequestCommand(e->newCUID(), this, e);
commands.push_back(command); commands.push_back(command);