andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

have proprocessor choose correct mmap args

Browse Source
This commit is contained in:
Tyler Neely 2014-05-09 14:49:25 -04:00
parent f41cde3105
commit deb89401fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/arena.cc
View File

@ -84,12 +84,13 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size,
((bytes - 1U) / huge_page_tlb_size + 1U) * huge_page_tlb_size;
assert(reserved_size >= bytes);
#ifdef MAP_HUGETLB
void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
(MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0);
#else
void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
(MAP_PRIVATE | MAP_ANONYMOUS), 0, 0);
// only supported in kernel's 2.6.34 and above
// void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
// (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0);
#endif
if (addr == MAP_FAILED) {
Warn(logger, "AllocateAligned fail to allocate huge TLB pages: %s",