mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

AbstractDiskWriter::closeFile(): Throw exception if close() failed.

Browse source 
~AbstractDiskWriter calles closeFile(), but suppresses exception.
MultiDiskAdaptor::closeFile() logs error if child
DiskWriter::closeFile() throws exception. This exception is not
rethrown. If at least one exception is caught,
MultiDiskAdaptor::closeFile() throws new DlAbortEx.
RequestGroupMan::closeFile() just logs exception and suppress each
exception. Generally, don't call closeFile() in destructor. If you
need to call it, it must suppress the exception.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-12-09 23:32:38 +09:00
parent 9a6f88c162
commit d5ffa2532d
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/AbstractDiskWriter.cc
View file

@ -59,7 +59,10 @@ AbstractDiskWriter::AbstractDiskWriter(const std::string& filename)
AbstractDiskWriter::~AbstractDiskWriter()
{
closeFile();
try {
closeFile();
} catch(...) {
}
}
void AbstractDiskWriter::openFile(off_t totalLength)
@ -78,8 +81,15 @@ void AbstractDiskWriter::openFile(off_t totalLength)
void AbstractDiskWriter::closeFile()
{
if(fd_ >= 0) {
close(fd_);
int r;
while((r = close(fd_)) == -1 && errno == EINTR);
fd_ = -1;
if(r == -1) {
int errNum = errno;
throw DL_ABORT_EX3(errNum, fmt("Failed to close file: %s",
util::safeStrerror(errNum).c_str()),
error_code::FILE_IO_ERROR);
}
}
}