database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Fix](memory) Fix allocator.h compiling failed on mac. (#38646)

Browse Source 
Backport #38562. Fix allocator.h compiling failed on mac which
introduced by #37257.
This commit is contained in:
Qi Chen
2024-08-01 13:56:53 +08:00
committed by GitHub
parent 63a3ff570b
commit 4042cdf553
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
be/src/vec/common/allocator.h
View File

@ -26,7 +26,14 @@
#if defined(USE_JEMALLOC)
#include <jemalloc/jemalloc.h>
#endif // defined(USE_JEMALLOC)
#ifdef __APPLE__
#include <malloc/malloc.h>
#define GET_MALLOC_SIZE(ptr) malloc_size(ptr)
#else
#include <malloc.h>
#define GET_MALLOC_SIZE(ptr) malloc_usable_size(ptr)
#endif
#include <stdint.h>
#include <string.h>
@ -64,6 +71,14 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
#ifndef __THROW
#if __cplusplus
#define __THROW noexcept
#else
#define __THROW
#endif
#endif
static constexpr size_t MMAP_MIN_ALIGNMENT = 4096;
static constexpr size_t MALLOC_MIN_ALIGNMENT = 8;
@ -106,7 +121,7 @@ public:
static constexpr bool need_record_actual_size() { return true; }
static size_t allocated_size(void* ptr) { return malloc_usable_size(ptr); }
static size_t allocated_size(void* ptr) { return GET_MALLOC_SIZE(ptr); }
static int posix_memalign(void** ptr, size_t alignment, size_t size) __THROW {
return ::posix_memalign(ptr, alignment, size);