Commit 5049c2b5 authored by Orvid King's avatar Orvid King Committed by facebook-github-bot-4

Don't do memory operations in chunks on MSVC

Summary: Because, especially with the way that munmap is implemented in my windows port, this is a very bad idea. Plus, it's completely unnecessary on Windows.
Closes https://github.com/facebook/folly/pull/265

Reviewed By: @yfeldblum

Differential Revision: D2283757

fb-gh-sync-id: 831c8aaad9bd5ad0fe091ea1e006814774d8a27c
parent 19b1f5f7
...@@ -211,6 +211,15 @@ off_t memOpChunkSize(off_t length, off_t pageSize) { ...@@ -211,6 +211,15 @@ off_t memOpChunkSize(off_t length, off_t pageSize) {
bool memOpInChunks(std::function<int(void*, size_t)> op, bool memOpInChunks(std::function<int(void*, size_t)> op,
void* mem, size_t bufSize, off_t pageSize, void* mem, size_t bufSize, off_t pageSize,
size_t& amountSucceeded) { size_t& amountSucceeded) {
#ifdef _MSC_VER
// MSVC doesn't have this problem, and calling munmap many times
// with the same address is a bad idea with the windows implementation.
int ret = op(mem, bufSize);
if (ret == 0) {
amountSucceeded = bufSize;
}
return ret == 0;
#else
// unmap/mlock/munlock take a kernel semaphore and block other threads from // unmap/mlock/munlock take a kernel semaphore and block other threads from
// doing other memory operations. If the size of the buffer is big the // doing other memory operations. If the size of the buffer is big the
// semaphore can be down for seconds (for benchmarks see // semaphore can be down for seconds (for benchmarks see
...@@ -232,6 +241,7 @@ bool memOpInChunks(std::function<int(void*, size_t)> op, ...@@ -232,6 +241,7 @@ bool memOpInChunks(std::function<int(void*, size_t)> op,
} }
return true; return true;
#endif
} }
} // anonymous namespace } // anonymous namespace
...@@ -253,11 +263,13 @@ bool MemoryMapping::mlock(LockMode lock) { ...@@ -253,11 +263,13 @@ bool MemoryMapping::mlock(LockMode lock) {
PLOG(FATAL) << msg; PLOG(FATAL) << msg;
} }
#ifndef _MSC_VER
// only part of the buffer was mlocked, unlock it back // only part of the buffer was mlocked, unlock it back
if (!memOpInChunks(::munlock, mapStart_, amountSucceeded, options_.pageSize, if (!memOpInChunks(::munlock, mapStart_, amountSucceeded, options_.pageSize,
amountSucceeded)) { amountSucceeded)) {
PLOG(WARNING) << "munlock()"; PLOG(WARNING) << "munlock()";
} }
#endif
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment