mirrors/aria2
0
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2024-11-27 20:14:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

2010-07-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse Source 
When allocating disk space, for Linux system with fallocate()
	system call, first check file system supports fallocate.  This
	just run fallocate with small chunk and see it succeeds or fails.
	If it succeeds, use fallocate() to allocate entire file otherwise
	fall back to traditional slower method: writing zeros. This
	behavior is enabled in --file-allocation=prealloc, so this is
	enabled by default for most modern Linux.
	* configure.ac
	* src/AbstractDiskWriter.cc
	* src/AbstractDiskWriter.h
	* src/AbstractSingleDiskAdaptor.cc
	* src/AdaptiveFileAllocationIterator.cc
	* src/AdaptiveFileAllocationIterator.h
	* src/DefaultPieceStorage.cc
	* src/DiskAdaptor.cc
	* src/DiskAdaptor.h
	* src/FallocFileAllocationIterator.cc
	* src/Makefile.am
	* src/MultiFileAllocationIterator.cc
	* src/OptionHandlerFactory.cc
	* test/FallocFileAllocationIteratorTest.cc
	* test/Makefile.am
This commit is contained in:
Tatsuhiro Tsujikawa 2010-07-04 15:03:35 +00:00
parent 8f10241e25
commit a5cc350dcf
20 changed files with 336 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@ -1,3 +1,28 @@
2010-07-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
When allocating disk space, for Linux system with fallocate()
system call, first check file system supports fallocate. This
just run fallocate with small chunk and see it succeeds or fails.
If it succeeds, use fallocate() to allocate entire file otherwise
fall back to traditional slower method: writing zeros. This
behavior is enabled in --file-allocation=prealloc, so this is
enabled by default for most modern Linux.
* configure.ac
* src/AbstractDiskWriter.cc
* src/AbstractDiskWriter.h
* src/AbstractSingleDiskAdaptor.cc
* src/AdaptiveFileAllocationIterator.cc
* src/AdaptiveFileAllocationIterator.h
* src/DefaultPieceStorage.cc
* src/DiskAdaptor.cc
* src/DiskAdaptor.h
* src/FallocFileAllocationIterator.cc
* src/Makefile.am
* src/MultiFileAllocationIterator.cc
* src/OptionHandlerFactory.cc
* test/FallocFileAllocationIteratorTest.cc
* test/Makefile.am
2010-06-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Release 1.9.5

6
config.h.in
View File

@ -126,6 +126,9 @@
/* Define to 1 if you have the `EVP_sha256' function. */
#undef HAVE_EVP_SHA256
/* Define to 1 if you have the `fallocate' function. */
#undef HAVE_FALLOCATE
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
@ -368,6 +371,9 @@
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if *_fallocate is available. */
#undef HAVE_SOME_FALLOCATE
/* Define to 1 if you have sqlite3. */
#undef HAVE_SQLITE3

47
configure vendored
View File

@ -630,8 +630,8 @@ HAVE_BASENAME_FALSE
HAVE_BASENAME_TRUE
HAVE_ASCTIME_R_FALSE
HAVE_ASCTIME_R_TRUE
HAVE_POSIX_FALLOCATE_FALSE
HAVE_POSIX_FALLOCATE_TRUE
HAVE_SOME_FALLOCATE_FALSE
HAVE_SOME_FALLOCATE_TRUE
HAVE_EPOLL_FALSE
HAVE_EPOLL_TRUE
POW_LIB
@ -14794,14 +14794,41 @@ fi
done
if test "x$have_posix_fallocate" = "xyes"; then
HAVE_POSIX_FALLOCATE_TRUE=
HAVE_POSIX_FALLOCATE_FALSE='#'
HAVE_SOME_FALLOCATE_TRUE=
HAVE_SOME_FALLOCATE_FALSE='#'
else
HAVE_POSIX_FALLOCATE_TRUE='#'
HAVE_POSIX_FALLOCATE_FALSE=
HAVE_SOME_FALLOCATE_TRUE='#'
HAVE_SOME_FALLOCATE_FALSE=
fi
for ac_func in fallocate
do :
ac_fn_cxx_check_func "$LINENO" "fallocate" "ac_cv_func_fallocate"
if test "x$ac_cv_func_fallocate" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FALLOCATE 1
_ACEOF
have_fallocate=yes
fi
done
if test "x$have_fallocate" = "xyes"; then
HAVE_SOME_FALLOCATE_TRUE=
HAVE_SOME_FALLOCATE_FALSE='#'
else
HAVE_SOME_FALLOCATE_TRUE='#'
HAVE_SOME_FALLOCATE_FALSE=
fi
if test "x$have_posix_fallocate" = "xyes" ||
test "x$have_fallocate" = "xyes"; then
$as_echo "#define HAVE_SOME_FALLOCATE 1" >>confdefs.h
fi
for ac_func in asctime_r
do :
ac_fn_cxx_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
@ -15481,8 +15508,12 @@ if test -z "${HAVE_EPOLL_TRUE}" && test -z "${HAVE_EPOLL_FALSE}"; then
as_fn_error "conditional \"HAVE_EPOLL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_POSIX_FALLOCATE_TRUE}" && test -z "${HAVE_POSIX_FALLOCATE_FALSE}"; then
as_fn_error "conditional \"HAVE_POSIX_FALLOCATE\" was never defined.
if test -z "${HAVE_SOME_FALLOCATE_TRUE}" && test -z "${HAVE_SOME_FALLOCATE_FALSE}"; then
as_fn_error "conditional \"HAVE_SOME_FALLOCATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SOME_FALLOCATE_TRUE}" && test -z "${HAVE_SOME_FALLOCATE_FALSE}"; then
as_fn_error "conditional \"HAVE_SOME_FALLOCATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ASCTIME_R_TRUE}" && test -z "${HAVE_ASCTIME_R_FALSE}"; then

11
configure.ac
View File

@ -356,7 +356,16 @@ fi
AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"])
AC_CHECK_FUNCS([posix_fallocate],[have_posix_fallocate=yes])
AM_CONDITIONAL([HAVE_POSIX_FALLOCATE], [test "x$have_posix_fallocate" = "xyes"])
AM_CONDITIONAL([HAVE_SOME_FALLOCATE], [test "x$have_posix_fallocate" = "xyes"])
AC_CHECK_FUNCS([fallocate], [have_fallocate=yes])
AM_CONDITIONAL([HAVE_SOME_FALLOCATE], [test "x$have_fallocate" = "xyes"])
if test "x$have_posix_fallocate" = "xyes" ||
test "x$have_fallocate" = "xyes"; then
AC_DEFINE([HAVE_SOME_FALLOCATE], [1],
[Define to 1 if *_fallocate is available.])
fi
AC_CHECK_FUNCS([asctime_r],
[AM_CONDITIONAL([HAVE_ASCTIME_R], true)],

16
src/AbstractDiskWriter.cc
View File

@ -193,19 +193,31 @@ void AbstractDiskWriter::truncate(uint64_t length)
#endif
}
#ifdef HAVE_POSIX_FALLOCATE
void AbstractDiskWriter::allocate(off_t offset, uint64_t length)
{
#ifdef HAVE_SOME_FALLOCATE
if(fd_ == -1) {
throw DL_ABORT_EX("File not yet opened.");
}
# ifdef HAVE_FALLOCATE
// For linux, we use fallocate to detect file system supports
// fallocate or not.
int r = fallocate(fd_, 0, offset, length);
if(r == -1) {
throw DL_ABORT_EX(StringFormat("fallocate failed. cause: %s",
strerror(errno)).str());
}
# elif HAVE_POSIX_FALLOCATE
int r = posix_fallocate(fd_, offset, length);
if(r != 0) {
throw DL_ABORT_EX(StringFormat("posix_fallocate failed. cause: %s",
strerror(r)).str());
}
# else
# error "no *_fallocate function available."
# endif
#endif // HAVE_SOME_FALLOCATE
}
#endif // HAVE_POSIX_FALLOCATE
uint64_t AbstractDiskWriter::size()
{

2
src/AbstractDiskWriter.h
View File

@ -75,10 +75,8 @@ public:
virtual void truncate(uint64_t length);
#ifdef HAVE_POSIX_FALLOCATE
// File must be opened before calling this function.
virtual void allocate(off_t offset, uint64_t length);
#endif // HAVE_POSIX_FALLOCATE
virtual uint64_t size();

17
src/AbstractSingleDiskAdaptor.cc
View File

@ -34,10 +34,10 @@
/* copyright --> */
#include "AbstractSingleDiskAdaptor.h"
#include "File.h"
#include "SingleFileAllocationIterator.h"
#ifdef HAVE_POSIX_FALLOCATE
#include "AdaptiveFileAllocationIterator.h"
#ifdef HAVE_SOME_FALLOCATE
# include "FallocFileAllocationIterator.h"
#endif // HAVE_POSIX_FALLOCATE
#endif // HAVE_SOME_FALLOCATE
#include "DiskWriter.h"
#include "FileEntry.h"
@ -95,22 +95,21 @@ void AbstractSingleDiskAdaptor::truncate(uint64_t length)
diskWriter_->truncate(length);
}
FileAllocationIteratorHandle
SharedHandle<FileAllocationIterator>
AbstractSingleDiskAdaptor::fileAllocationIterator()
{
#ifdef HAVE_POSIX_FALLOCATE
#ifdef HAVE_SOME_FALLOCATE
if(doesFallocate()) {
SharedHandle<FallocFileAllocationIterator> h
(new FallocFileAllocationIterator
(diskWriter_.get(), size() ,totalLength_));
return h;
} else
#endif // HAVE_POSIX_FALLOCATE
#endif // HAVE_SOME_FALLOCATE
{
SingleFileAllocationIteratorHandle h
(new SingleFileAllocationIterator
SharedHandle<AdaptiveFileAllocationIterator> h
(new AdaptiveFileAllocationIterator
(diskWriter_.get(), size(), totalLength_));
h->init();
return h;
}
}

102
src/AdaptiveFileAllocationIterator.cc Normal file
View File

@ -0,0 +1,102 @@
/* <!-- copyright */
/*
* aria2 - The high speed download utility
*
* Copyright (C) 2010 Tatsuhiro Tsujikawa
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of portions of this program with the
* OpenSSL library under certain conditions as described in each
* individual source file, and distribute linked combinations
* including the two.
* You must obey the GNU General Public License in all respects
* for all of the code used other than OpenSSL. If you modify
* file(s) with this exception, you may extend this exception to your
* version of the file(s), but you are not obligated to do so. If you
* do not wish to do so, delete this exception statement from your
* version. If you delete this exception statement from all source
* files in the program, then also delete it here.
*/
/* copyright --> */
#include "AdaptiveFileAllocationIterator.h"
#include "BinaryStream.h"
#ifdef HAVE_FALLOCATE
# include "FallocFileAllocationIterator.h"
#endif // HAVE_FALLOCATE
#include "SingleFileAllocationIterator.h"
#include "RecoverableException.h"
#include "LogFactory.h"
#include "Logger.h"
namespace aria2 {
AdaptiveFileAllocationIterator::AdaptiveFileAllocationIterator
(BinaryStream* stream, off_t offset, uint64_t totalLength):
stream_(stream), offset_(offset), totalLength_(totalLength),
logger_(LogFactory::getInstance()) {}
AdaptiveFileAllocationIterator::~AdaptiveFileAllocationIterator() {}
void AdaptiveFileAllocationIterator::allocateChunk()
{
if(allocator_.isNull()) {
#ifdef HAVE_FALLOCATE
try {
if(logger_->debug()) {
logger_->debug("Testing file system supports fallocate.");
}
if(static_cast<uint64_t>(offset_) < totalLength_) {
off_t len = std::min(totalLength_-offset_, static_cast<uint64_t>(4096));
stream_->allocate(offset_, len);
offset_ += len;
}
if(logger_->debug()) {
logger_->debug("File system supports fallocate.");
}
allocator_.reset
(new FallocFileAllocationIterator(stream_, offset_, totalLength_));
} catch(RecoverableException& e) {
if(logger_->debug()) {
logger_->debug("File system does not support fallocate.");
}
SharedHandle<SingleFileAllocationIterator> salloc
(new SingleFileAllocationIterator(stream_, offset_, totalLength_));
salloc->init();
allocator_ = salloc;
}
#else // !HAVE_FALLOCATE
SharedHandle<SingleFileAllocationIterator> salloc
(new SingleFileAllocationIterator(stream_, offset_, totalLength_));
salloc->init();
allocator_ = salloc;
#endif // !HAVE_FALLOCATE
allocator_->allocateChunk();
} else {
allocator_->allocateChunk();
}
}
bool AdaptiveFileAllocationIterator::finished()
{
if(allocator_.isNull()) {
return false;
} else {
return allocator_->finished();
}
}
} // namespace aria2

80
src/AdaptiveFileAllocationIterator.h Normal file
View File

@ -0,0 +1,80 @@
/* <!-- copyright */
/*
* aria2 - The high speed download utility
*
* Copyright (C) 2010 Tatsuhiro Tsujikawa
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of portions of this program with the
* OpenSSL library under certain conditions as described in each
* individual source file, and distribute linked combinations
* including the two.
* You must obey the GNU General Public License in all respects
* for all of the code used other than OpenSSL. If you modify
* file(s) with this exception, you may extend this exception to your
* version of the file(s), but you are not obligated to do so. If you
* do not wish to do so, delete this exception statement from your
* version. If you delete this exception statement from all source
* files in the program, then also delete it here.
*/
/* copyright --> */
#ifndef D_ADAPTIVE_FILE_ALLOCATION_ITERATOR_H
#define D_ADAPTIVE_FILE_ALLOCATION_ITERATOR_H
#include "FileAllocationIterator.h"
namespace aria2 {
class BinaryStream;
class Logger;
class AdaptiveFileAllocationIterator:public FileAllocationIterator
{
private:
SharedHandle<FileAllocationIterator> allocator_;
BinaryStream* stream_;
off_t offset_;
uint64_t totalLength_;
Logger* logger_;
public:
AdaptiveFileAllocationIterator
(BinaryStream* stream, off_t offset, uint64_t totalLength);
virtual ~AdaptiveFileAllocationIterator();
virtual void allocateChunk();
virtual bool finished();
virtual off_t getCurrentLength()
{
return offset_;
}
virtual uint64_t getTotalLength()
{
return totalLength_;
}
};
} // namespace aria2
#endif // D_ADAPTIVE_FILE_ALLOCATION_ITERATOR_H

2
src/DefaultPieceStorage.cc
View File

@ -509,11 +509,9 @@ void DefaultPieceStorage::initStorage()
(option_->getAsInt(PREF_BT_MAX_OPEN_FILES));
diskAdaptor_ = multiDiskAdaptor;
}
#ifdef HAVE_POSIX_FALLOCATE
if(option_->get(PREF_FILE_ALLOCATION) == V_FALLOC) {
diskAdaptor_->enableFallocate();
}
#endif // HAVE_POSIX_FALLOCATE
}
void DefaultPieceStorage::setBitfield(const unsigned char* bitfield,

2
src/DiskAdaptor.cc
View File

@ -40,9 +40,7 @@
namespace aria2 {
DiskAdaptor::DiskAdaptor():
#ifdef HAVE_POSIX_FALLOCATE
fallocate_(false),
#endif // HAVE_POSIX_FALLOCATE
logger_(LogFactory::getInstance()) {}
} // namespace aria2

6
src/DiskAdaptor.h
View File

@ -51,9 +51,9 @@ class FileAllocationIterator;
class DiskAdaptor:public BinaryStream {
private:
std::vector<SharedHandle<FileEntry> > fileEntries_;
#ifdef HAVE_POSIX_FALLOCATE
bool fallocate_;
#endif // HAVE_POSIX_FALLOCATE
Logger* logger_;
protected:
Logger* getLogger() const
@ -110,7 +110,6 @@ public:
// successfully changed.
virtual size_t utime(const Time& actime, const Time& modtime) = 0;
#ifdef HAVE_POSIX_FALLOCATE
void enableFallocate()
{
fallocate_ = true;
@ -125,7 +124,6 @@ public:
{
return fallocate_;
}
#endif // HAVE_POSIX_FALLOCATE
};
typedef SharedHandle<DiskAdaptor> DiskAdaptorHandle;

11
src/FallocFileAllocationIterator.cc
View File

@ -43,12 +43,13 @@ FallocFileAllocationIterator::FallocFileAllocationIterator
void FallocFileAllocationIterator::allocateChunk()
{
if(static_cast<uint64_t>(offset_) > totalLength_) {
throw DL_ABORT_EX("FallocFileAllocationIterator: offset is larger than"
" totalLength");
if(static_cast<uint64_t>(offset_) < totalLength_) {
stream_->allocate(offset_, totalLength_-offset_);
offset_ = totalLength_;
} else {
stream_->truncate(totalLength_);
offset_ = totalLength_;
}
stream_->allocate(offset_, totalLength_-offset_);
offset_ = totalLength_;
}
bool FallocFileAllocationIterator::finished()

7
src/Makefile.am
View File

@ -205,7 +205,8 @@ SRCS = Socket.h\
timespec.h\
ValueBase.cc ValueBase.h\
ContextAttribute.h\
TorrentAttribute.h
TorrentAttribute.h\
AdaptiveFileAllocationIterator.cc AdaptiveFileAllocationIterator.h
if ENABLE_XML_RPC
SRCS += XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\
@ -235,9 +236,9 @@ endif # HAVE_LIBEXPAT
endif # ENABLE_XML_RPC
if HAVE_POSIX_FALLOCATE
if HAVE_SOME_FALLOCATE
SRCS += FallocFileAllocationIterator.cc FallocFileAllocationIterator.h
endif # HAVE_POSIX_FALLOCATE
endif # HAVE_SOME_FALLOCATE
if HAVE_EPOLL
SRCS += EpollEventPoll.cc EpollEventPoll.h

26
src/Makefile.in
View File

@ -52,11 +52,12 @@ bin_PROGRAMS = aria2c$(EXEEXT)
@ENABLE_XML_RPC_TRUE@ HttpListenCommand.cc HttpListenCommand.h\
@ENABLE_XML_RPC_TRUE@ HttpServerCommand.cc HttpServerCommand.h\
@ENABLE_XML_RPC_TRUE@ HttpServerResponseCommand.cc HttpServerResponseCommand.h\
@ENABLE_XML_RPC_TRUE@ HttpServer.cc HttpServer.h
@ENABLE_XML_RPC_TRUE@ HttpServer.cc HttpServer.h\
@ENABLE_XML_RPC_TRUE@ AdaptiveFileAllocationIterator.cc AdaptiveFileAllocationIterator.h
@ENABLE_XML_RPC_TRUE@@HAVE_LIBXML2_TRUE@am__append_2 = Xml2XmlRpcRequestProcessor.cc Xml2XmlRpcRequestProcessor.h
@ENABLE_XML_RPC_TRUE@@HAVE_LIBEXPAT_TRUE@am__append_3 = ExpatXmlRpcRequestProcessor.cc ExpatXmlRpcRequestProcessor.h
@HAVE_POSIX_FALLOCATE_TRUE@am__append_4 = FallocFileAllocationIterator.cc FallocFileAllocationIterator.h
@HAVE_SOME_FALLOCATE_TRUE@am__append_4 = FallocFileAllocationIterator.cc FallocFileAllocationIterator.h
@HAVE_EPOLL_TRUE@am__append_5 = EpollEventPoll.cc EpollEventPoll.h
@ENABLE_SSL_TRUE@am__append_6 = TLSContext.h
@HAVE_LIBGNUTLS_TRUE@am__append_7 = LibgnutlsTLSContext.cc LibgnutlsTLSContext.h
@ -452,13 +453,14 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
HttpListenCommand.cc HttpListenCommand.h HttpServerCommand.cc \
HttpServerCommand.h HttpServerResponseCommand.cc \
HttpServerResponseCommand.h HttpServer.cc HttpServer.h \
Xml2XmlRpcRequestProcessor.cc Xml2XmlRpcRequestProcessor.h \
ExpatXmlRpcRequestProcessor.cc ExpatXmlRpcRequestProcessor.h \
FallocFileAllocationIterator.cc FallocFileAllocationIterator.h \
EpollEventPoll.cc EpollEventPoll.h TLSContext.h \
LibgnutlsTLSContext.cc LibgnutlsTLSContext.h \
LibsslTLSContext.cc LibsslTLSContext.h GZipDecoder.cc \
GZipDecoder.h GZipEncoder.cc GZipEncoder.h \
AdaptiveFileAllocationIterator.cc \
AdaptiveFileAllocationIterator.h Xml2XmlRpcRequestProcessor.cc \
Xml2XmlRpcRequestProcessor.h ExpatXmlRpcRequestProcessor.cc \
ExpatXmlRpcRequestProcessor.h FallocFileAllocationIterator.cc \
FallocFileAllocationIterator.h EpollEventPoll.cc \
EpollEventPoll.h TLSContext.h LibgnutlsTLSContext.cc \
LibgnutlsTLSContext.h LibsslTLSContext.cc LibsslTLSContext.h \
GZipDecoder.cc GZipDecoder.h GZipEncoder.cc GZipEncoder.h \
Sqlite3MozCookieParser.cc Sqlite3MozCookieParser.h \
AsyncNameResolver.cc AsyncNameResolver.h \
IteratableChunkChecksumValidator.cc \
@ -626,10 +628,11 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
@ENABLE_XML_RPC_TRUE@ HttpListenCommand.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ HttpServerCommand.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ HttpServerResponseCommand.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ HttpServer.$(OBJEXT)
@ENABLE_XML_RPC_TRUE@ HttpServer.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ AdaptiveFileAllocationIterator.$(OBJEXT)
@ENABLE_XML_RPC_TRUE@@HAVE_LIBXML2_TRUE@am__objects_2 = Xml2XmlRpcRequestProcessor.$(OBJEXT)
@ENABLE_XML_RPC_TRUE@@HAVE_LIBEXPAT_TRUE@am__objects_3 = ExpatXmlRpcRequestProcessor.$(OBJEXT)
@HAVE_POSIX_FALLOCATE_TRUE@am__objects_4 = FallocFileAllocationIterator.$(OBJEXT)
@HAVE_SOME_FALLOCATE_TRUE@am__objects_4 = FallocFileAllocationIterator.$(OBJEXT)
@HAVE_EPOLL_TRUE@am__objects_5 = EpollEventPoll.$(OBJEXT)
am__objects_6 =
@HAVE_LIBGNUTLS_TRUE@am__objects_7 = LibgnutlsTLSContext.$(OBJEXT)
@ -1343,6 +1346,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbstractProxyResponseCommand.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbstractSingleDiskAdaptor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ActivePeerConnectionCommand.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdaptiveFileAllocationIterator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdaptiveURISelector.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AnnounceList.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncNameResolver.Po@am__quote@

29
src/MultiFileAllocationIterator.cc
View File

@ -35,15 +35,16 @@
#include "MultiFileAllocationIterator.h"
#include "MultiDiskAdaptor.h"
#include "FileEntry.h"
#include "SingleFileAllocationIterator.h"
#ifdef HAVE_POSIX_FALLOCATE
#include "AdaptiveFileAllocationIterator.h"
#ifdef HAVE_SOME_FALLOCATE
# include "FallocFileAllocationIterator.h"
#endif // HAVE_POSIX_FALLOCATE
#endif // HAVE_SOME_FALLOCATE
#include "DiskWriter.h"
namespace aria2 {
MultiFileAllocationIterator::MultiFileAllocationIterator(MultiDiskAdaptor* diskAdaptor):
MultiFileAllocationIterator::MultiFileAllocationIterator
(MultiDiskAdaptor* diskAdaptor):
diskAdaptor_(diskAdaptor),
entries_(diskAdaptor_->diskWriterEntries_.begin(),
diskAdaptor_->diskWriterEntries_.end()),
@ -54,7 +55,8 @@ MultiFileAllocationIterator::~MultiFileAllocationIterator() {}
void MultiFileAllocationIterator::allocateChunk()
{
while(fileAllocationIterator_.isNull() || fileAllocationIterator_->finished()) {
while(fileAllocationIterator_.isNull() ||
fileAllocationIterator_->finished()) {
if(entries_.empty()) {
break;
}
@ -65,21 +67,19 @@ void MultiFileAllocationIterator::allocateChunk()
diskAdaptor_->openIfNot(entry, &DiskWriterEntry::openFile);
if(entry->needsFileAllocation() && entry->size() < fileEntry->getLength()) {
// Calling private function of MultiDiskAdaptor.
#ifdef HAVE_POSIX_FALLOCATE
#ifdef HAVE_SOME_FALLOCATE
if(diskAdaptor_->doesFallocate()) {
fileAllocationIterator_.reset
(new FallocFileAllocationIterator(entry->getDiskWriter().get(),
entry->size(),
fileEntry->getLength()));
} else
#endif // HAVE_POSIX_FALLOCATE
#endif // HAVE_SOME_FALLOCATE
{
SharedHandle<SingleFileAllocationIterator> fa
(new SingleFileAllocationIterator(entry->getDiskWriter().get(),
entry->size(),
fileEntry->getLength()));
fa->init();
fileAllocationIterator_ = fa;
fileAllocationIterator_.reset
(new AdaptiveFileAllocationIterator(entry->getDiskWriter().get(),
entry->size(),
fileEntry->getLength()));
}
}
}
@ -91,7 +91,8 @@ void MultiFileAllocationIterator::allocateChunk()
bool MultiFileAllocationIterator::finished()
{
return entries_.empty() && (fileAllocationIterator_.isNull() || fileAllocationIterator_->finished());
return entries_.empty() &&
(fileAllocationIterator_.isNull() || fileAllocationIterator_->finished());
}
off_t MultiFileAllocationIterator::getCurrentLength()

4
src/OptionHandlerFactory.cc
View File

@ -244,9 +244,9 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
TEXT_FILE_ALLOCATION,
V_PREALLOC,
V_NONE, V_PREALLOC,
#ifdef HAVE_POSIX_FALLOCATE
#ifdef HAVE_SOME_FALLOCATE
V_FALLOC,
#endif // HAVE_POSIX_FALLOCATE
#endif // HAVE_SOME_FALLOCATE
'a'));
op->addTag(TAG_BASIC);
op->addTag(TAG_FILE);

4
test/FallocFileAllocationIteratorTest.cc
View File

@ -26,6 +26,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION( FallocFileAllocationIteratorTest );
void FallocFileAllocationIteratorTest::testAllocate()
{
// When fallocate is used, test fails if file system does not
// support it. So skip it.
#ifndef HAVE_FALLOCATE
std::string dir = "./";
std::string fname = "aria2_FallocFileAllocationIteratorTest_testAllocate";
std::string fn = dir+"/"+fname;
@ -48,6 +51,7 @@ void FallocFileAllocationIteratorTest::testAllocate()
CPPUNIT_ASSERT(itr.finished());
CPPUNIT_ASSERT_EQUAL((uint64_t)40960, f.size());
#endif // !HAVE_FALLOCATE
}
} // namespace aria2

4
test/Makefile.am
View File

@ -80,9 +80,9 @@ aria2c_SOURCES += XmlRpcRequestParserControllerTest.cc\
XmlRpcMethodTest.cc
endif # ENABLE_XML_RPC
if HAVE_POSIX_FALLOCATE
if HAVE_SOME_FALLOCATE
aria2c_SOURCES += FallocFileAllocationIteratorTest.cc
endif # HAVE_POSIX_FALLOCATE
endif # HAVE_SOME_FALLOCATE
if HAVE_LIBZ
aria2c_SOURCES += GZipDecoderTest.cc\

4
test/Makefile.in
View File

@ -40,7 +40,7 @@ check_PROGRAMS = $(am__EXEEXT_1)
@ENABLE_XML_RPC_TRUE@ XmlRpcRequestProcessorTest.cc\
@ENABLE_XML_RPC_TRUE@ XmlRpcMethodTest.cc
@HAVE_POSIX_FALLOCATE_TRUE@am__append_2 = FallocFileAllocationIteratorTest.cc
@HAVE_SOME_FALLOCATE_TRUE@am__append_2 = FallocFileAllocationIteratorTest.cc
@HAVE_LIBZ_TRUE@am__append_3 = GZipDecoderTest.cc\
@HAVE_LIBZ_TRUE@ GZipEncoderTest.cc
@ -275,7 +275,7 @@ am__aria2c_SOURCES_DIST = AllTest.cc TestUtil.cc TestUtil.h \
@ENABLE_XML_RPC_TRUE@am__objects_1 = XmlRpcRequestParserControllerTest.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ XmlRpcRequestProcessorTest.$(OBJEXT) \
@ENABLE_XML_RPC_TRUE@ XmlRpcMethodTest.$(OBJEXT)
@HAVE_POSIX_FALLOCATE_TRUE@am__objects_2 = FallocFileAllocationIteratorTest.$(OBJEXT)
@HAVE_SOME_FALLOCATE_TRUE@am__objects_2 = FallocFileAllocationIteratorTest.$(OBJEXT)
@HAVE_LIBZ_TRUE@am__objects_3 = GZipDecoderTest.$(OBJEXT) \
@HAVE_LIBZ_TRUE@ GZipEncoderTest.$(OBJEXT)
@HAVE_SQLITE3_TRUE@am__objects_4 = \