diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-07-04 15:03:35 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-07-04 15:03:35 +0000 |
| commit | a5cc350dcf6cf83a84b5845e0f61230f1f42e7c7 (patch) | |
| tree | 38d73b2aebcdd3c26d76782690d6bb10fe29ad86 /src/FallocFileAllocationIterator.cc | |
| parent | 8f10241e25d796655a8aaaf7cf69c7061d05bc43 (diff) | |
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
Diffstat (limited to 'src/FallocFileAllocationIterator.cc')
| -rw-r--r-- | src/FallocFileAllocationIterator.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/FallocFileAllocationIterator.cc b/src/FallocFileAllocationIterator.cc index 1fd53d68..3e4e24d1 100644 --- a/src/FallocFileAllocationIterator.cc +++ b/src/FallocFileAllocationIterator.cc @@ -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() |