TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-14 14:59:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

VirtualFree() doesn't seem to work as needed at the moment

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-06-26 20:06:32 +02:00
parent be4f1a3e80
commit df195a88b5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dwarfs/mmap.cpp
View File

@ -73,6 +73,7 @@ std::error_code mmap::release(file_off_t offset [[maybe_unused]],
size_t size [[maybe_unused]]) { size_t size [[maybe_unused]]) {
std::error_code ec; std::error_code ec;
#ifndef _WIN32
auto misalign = offset % page_size_; auto misalign = offset % page_size_;
offset -= misalign; offset -= misalign;
@ -80,11 +81,13 @@ std::error_code mmap::release(file_off_t offset [[maybe_unused]],
size -= size % page_size_; size -= size % page_size_;
auto data = const_cast<char*>(mf_.const_data() + offset); auto data = const_cast<char*>(mf_.const_data() + offset);
#endif
#ifdef _WIN32 #ifdef _WIN32
if (::VirtualFree(data, size, MEM_DECOMMIT) == 0) { //// TODO: this doesn't currently work
ec.assign(::GetLastError(), std::system_category()); // if (::VirtualFree(data, size, MEM_DECOMMIT) == 0) {
} // ec.assign(::GetLastError(), std::system_category());
// }
#else #else
if (::madvise(data, size, MADV_DONTNEED) != 0) { if (::madvise(data, size, MADV_DONTNEED) != 0) {
ec.assign(errno, std::generic_category()); ec.assign(errno, std::generic_category());
@ -97,14 +100,17 @@ std::error_code mmap::release(file_off_t offset [[maybe_unused]],
std::error_code mmap::release_until(file_off_t offset [[maybe_unused]]) { std::error_code mmap::release_until(file_off_t offset [[maybe_unused]]) {
std::error_code ec; std::error_code ec;
#ifndef _WIN32
offset -= offset % page_size_; offset -= offset % page_size_;
auto data = const_cast<char*>(mf_.const_data()); auto data = const_cast<char*>(mf_.const_data());
#endif
#ifdef _WIN32 #ifdef _WIN32
if (::VirtualFree(data, offset, MEM_DECOMMIT) == 0) { //// TODO: this doesn't currently work
ec.assign(::GetLastError(), std::system_category()); // if (::VirtualFree(data, offset, MEM_DECOMMIT) == 0) {
} // ec.assign(::GetLastError(), std::system_category());
// }
#else #else
if (::madvise(data, offset, MADV_DONTNEED) != 0) { if (::madvise(data, offset, MADV_DONTNEED) != 0) {
ec.assign(errno, std::generic_category()); ec.assign(errno, std::generic_category());