BitMaster/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2026-04-13 08:18:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Browse Source 
Create only requested files and files which shares a piece with
	requested file in multi-torrent downloads. Directory structures 
are
	also created in the same rule.
	MultiDiskAdaptor::fileExists() now uses FileEntry instead of
	DiskWriterEntry as in the previous implementation.
	* src/MultiDiskWriter.cc
	* src/MultiFileAllocationIterator.cc
	* src/MultiFileAllocationIterator.h
	* test/MultiFileAllocationIteratorTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa
2008-06-15 16:19:06 +00:00
parent f9988a4ef6
commit 2f8e184fe5
5 changed files with 115 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/MultiFileAllocationIterator.cc
View File

@@ -42,11 +42,9 @@ namespace aria2 {
MultiFileAllocationIterator::MultiFileAllocationIterator(MultiDiskAdaptor* diskAdaptor):
_diskAdaptor(diskAdaptor),
_entries(_diskAdaptor->diskWriterEntries),
_offset(0)
{
makeDiskWriterEntries(_entries, diskAdaptor->diskWriterEntries,
diskAdaptor->getPieceLength());
}
{}
MultiFileAllocationIterator::~MultiFileAllocationIterator() {}
@@ -106,41 +104,4 @@ const DiskWriterEntries& MultiFileAllocationIterator::getDiskWriterEntries() con
return _entries;
}
void MultiFileAllocationIterator::makeDiskWriterEntries
(std::deque<SharedHandle<DiskWriterEntry> >& dwEntries,
const DiskWriterEntries& srcEntries, size_t pieceLength) const
{
if(pieceLength == 0) {
for(DiskWriterEntries::const_iterator itr = srcEntries.begin(); itr != srcEntries.end(); ++itr) {
if((*itr)->getFileEntry()->isRequested()) {
dwEntries.push_back(*itr);
}
}
} else {
DiskWriterEntries temp(srcEntries);
{
SharedHandle<FileEntry> f(new FileEntry());
SharedHandle<DiskWriterEntry> e(new DiskWriterEntry(f));
temp.push_front(e);
}
DiskWriterEntries::const_iterator done = temp.begin();
for(DiskWriterEntries::const_iterator itr = temp.begin()+1; itr != temp.end(); ++itr) {
const FileEntryHandle& fileEntry = (*itr)->getFileEntry();
if(!fileEntry->isRequested()) {
continue;
}
off_t pieceStartOffset = (fileEntry->getOffset()/pieceLength)*pieceLength;
for(DiskWriterEntries::const_iterator i = itr-1; i != done; --i) {
if((uint64_t)pieceStartOffset < (*i)->getFileEntry()->getOffset()+(*i)->getFileEntry()->getLength()) {
dwEntries.push_back(*i);
} else {
break;
}
}
dwEntries.push_back(*itr);
done = itr;
}
}
}
} // namespace aria2