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

Fix jemalloc compliation problem on macOS (#7624)

Browse Source 
Summary:
Closes https://github.com/facebook/rocksdb/issues/7269

I have only tested this on macOS, let's see what CI makes of it for the other platforms...

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7624

Reviewed By: ajkr

Differential Revision: D24834305

Pulled By: pdillinger

fbshipit-source-id: ba818d8424297ccebd18ed854b044764c2dbab5f
This commit is contained in:
Adam Retter 2020-11-17 15:27:51 -08:00 committed by Facebook GitHub Bot
parent 699411b2ca
commit 4c336c6912
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
port/jemalloc_helper.h
View File

@ -40,23 +40,34 @@ static inline bool HasJemalloc() { return true; }
// Declare non-standard jemalloc APIs as weak symbols. We can null-check these // Declare non-standard jemalloc APIs as weak symbols. We can null-check these
// symbols to detect whether jemalloc is linked with the binary. // symbols to detect whether jemalloc is linked with the binary.
extern "C" void* mallocx(size_t, int) __attribute__((__nothrow__, __weak__)); extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW *
extern "C" void* rallocx(void*, size_t, int) __attribute__((__nothrow__, __weak__)); mallocx(size_t, int) JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1)
extern "C" size_t xallocx(void*, size_t, size_t, int) __attribute__((__nothrow__, __weak__)); __attribute__((__weak__));
extern "C" size_t sallocx(const void*, int) __attribute__((__nothrow__, __weak__)); extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW *
extern "C" void dallocx(void*, int) __attribute__((__nothrow__, __weak__)); rallocx(void *, size_t, int) JEMALLOC_ALLOC_SIZE(2) __attribute__((__weak__));
extern "C" void sdallocx(void*, size_t, int) __attribute__((__nothrow__, __weak__)); extern "C" size_t JEMALLOC_NOTHROW xallocx(void *, size_t, size_t, int)
extern "C" size_t nallocx(size_t, int) __attribute__((__nothrow__, __weak__)); __attribute__((__weak__));
extern "C" int mallctl(const char*, void*, size_t*, void*, size_t) extern "C" size_t JEMALLOC_NOTHROW sallocx(const void *, int)
__attribute__((__nothrow__, __weak__)); JEMALLOC_ATTR(pure) __attribute__((__weak__));
extern "C" int mallctlnametomib(const char*, size_t*, size_t*) extern "C" void JEMALLOC_NOTHROW dallocx(void *, int) __attribute__((__weak__));
__attribute__((__nothrow__, __weak__)); extern "C" void JEMALLOC_NOTHROW sdallocx(void *, size_t, int)
extern "C" int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, __attribute__((__weak__));
size_t) __attribute__((__nothrow__, __weak__)); extern "C" size_t JEMALLOC_NOTHROW nallocx(size_t, int) JEMALLOC_ATTR(pure)
extern "C" void malloc_stats_print(void (*)(void*, const char*), void*, __attribute__((__weak__));
const char*) __attribute__((__nothrow__, __weak__)); extern "C" int JEMALLOC_NOTHROW mallctl(const char *, void *, size_t *, void *,
extern "C" size_t malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void*) size_t) __attribute__((__weak__));
JEMALLOC_CXX_THROW __attribute__((__weak__)); extern "C" int JEMALLOC_NOTHROW mallctlnametomib(const char *, size_t *,
size_t *)
__attribute__((__weak__));
extern "C" int JEMALLOC_NOTHROW mallctlbymib(const size_t *, size_t, void *,
size_t *, void *, size_t)
__attribute__((__weak__));
extern "C" void JEMALLOC_NOTHROW
malloc_stats_print(void (*)(void *, const char *), void *, const char *)
__attribute__((__weak__));
extern "C" size_t JEMALLOC_NOTHROW
malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void *) JEMALLOC_CXX_THROW
__attribute__((__weak__));
// Check if Jemalloc is linked with the binary. Note the main program might be // Check if Jemalloc is linked with the binary. Note the main program might be
// using a different memory allocator even this method return true. // using a different memory allocator even this method return true.