thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-05 15:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Pavel Kartavyy 2015-08-31 18:35:32 +03:00
commit 7aa486e89d
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dbms/include/DB/Common/Allocator.h
View File

@ -36,9 +36,8 @@ public:
if (size >= MMAP_THRESHOLD)
{
if (alignment > MMAP_MIN_ALIGNMENT)
throw DB::Exception("Too large alignment: more than page size.", DB::ErrorCodes::BAD_ARGUMENTS);
if (alignment <= MMAP_MIN_ALIGNMENT)
{
buf = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (MAP_FAILED == buf)
DB::throwFromErrno("Allocator: Cannot mmap.", DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY);
@ -48,6 +47,12 @@ public:
DB::throwFromErrno("HashTableAllocator: Cannot madvise with MADV_HUGEPAGE.", DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY);
}
else
{
/// если выравнивание больше, чем размер страницы используем posix_memalign
buf = allocateUsingPosixMemalign(size, alignment);
}
}
else
{
if (alignment <= MALLOC_MIN_ALIGNMENT)
{
@ -58,11 +63,7 @@ public:
}
else
{
buf = nullptr;
int res = posix_memalign(&buf, alignment, size);
if (0 != res)
DB::throwFromErrno("Cannot allocate memory (posix_memalign)", DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY, res);
buf = allocateUsingPosixMemalign(size, alignment);
}
}
@ -121,4 +122,17 @@ public:
return buf;
}
private:
void * allocateUsingPosixMemalign(size_t size, size_t alignment)
{
void * buf = nullptr;
int res = posix_memalign(&buf, alignment, size);
if (0 != res)
DB::throwFromErrno("Cannot allocate memory (posix_memalign)", DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY, res);
return buf;
}
};