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

Merge pull request #141 from dallasmarlow/master

Browse Source 
only use MAP_HUGETLB when the kernel supports it
This commit is contained in:
Igor Canadi 2014-05-11 15:44:32 -07:00
commit d08073aafc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/arena.cc
View File

@ -76,7 +76,7 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size,
assert((kAlignUnit & (kAlignUnit - 1)) == assert((kAlignUnit & (kAlignUnit - 1)) ==
0); // Pointer size should be a power of 2 0); // Pointer size should be a power of 2
#ifdef OS_LINUX #ifdef MAP_HUGETLB
if (huge_page_tlb_size > 0 && bytes > 0) { if (huge_page_tlb_size > 0 && bytes > 0) {
// Allocate from a huge page TBL table. // Allocate from a huge page TBL table.
assert(logger != nullptr); // logger need to be passed in. assert(logger != nullptr); // logger need to be passed in.
@ -85,6 +85,7 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_tlb_size,
assert(reserved_size >= bytes); assert(reserved_size >= bytes);
void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE), void* addr = mmap(nullptr, reserved_size, (PROT_READ | PROT_WRITE),
(MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0); (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB), 0, 0);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
Warn(logger, "AllocateAligned fail to allocate huge TLB pages: %s", Warn(logger, "AllocateAligned fail to allocate huge TLB pages: %s",
strerror(errno)); strerror(errno));