mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmap: don't throw exceptions in destructor..

metadata
Wenzel Jakob 2013-11-27 12:49:03 +01:00
parent 96832ab70d
commit 73b6dc4ce2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcore/mmap.cpp
View File

@ -104,14 +104,20 @@ MemoryMappedFile::~MemoryMappedFile() {
#if defined(__LINUX__) || defined(__OSX__) #if defined(__LINUX__) || defined(__OSX__)
int retval = munmap(d->data, d->size); int retval = munmap(d->data, d->size);
if (retval != 0) if (retval != 0)
Log(EError, "munmap(): unable to unmap memory!"); Log(EWarn, "munmap(): unable to unmap memory!");
#elif defined(WIN32) #elif defined(WIN32)
if (!UnmapViewOfFile(d->data)) if (!UnmapViewOfFile(d->data) {
Log(EError, "UnmapViewOfFile(): unable to unmap memory: %s", lastErrorText().c_str()); Log(EWarn, "UnmapViewOfFile(): unable to unmap memory: %s", lastErrorText().c_str());
if (!CloseHandle(d->fileMapping)) return;
Log(EError, "CloseHandle(): unable to close file mapping: %s", lastErrorText().c_str()); }
if (!CloseHandle(d->file)) if (!CloseHandle(d->fileMapping)) {
Log(EError, "CloseHandle(): unable to close file: %s", lastErrorText().c_str()); Log(EWarn, "CloseHandle(): unable to close file mapping: %s", lastErrorText().c_str());
return;
}
if (!CloseHandle(d->file)) {
Log(EWarn, "CloseHandle(): unable to close file: %s", lastErrorText().c_str());
return;
}
#endif #endif
} }
} }