From: Yi Wu Date: Fri, 12 Oct 2018 18:48:52 +0000 (-0700) Subject: Fix compile error with jemalloc (#4488) X-Git-Tag: v5.17.2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae5305ee701f2b7e2d25b02d6c4c7432a0291d87;p=rocksdb.git Fix compile error with jemalloc (#4488) Summary: The "je_" prefix of jemalloc APIs presents only when the macro `JEMALLOC_NO_RENAME` from jemalloc.h presents. With the patch I'm also adding -DROCKSDB_JEMALLOC flag in buck TARGETS. Pull Request resolved: https://github.com/facebook/rocksdb/pull/4488 Differential Revision: D10355971 Pulled By: yiwu-arbug fbshipit-source-id: 03a2d69790a44ac89219c7525763fa937a63d95a --- diff --git a/db/malloc_stats.cc b/db/malloc_stats.cc index 02e89503..ba971b54 100644 --- a/db/malloc_stats.cc +++ b/db/malloc_stats.cc @@ -18,9 +18,11 @@ namespace rocksdb { #ifdef ROCKSDB_JEMALLOC #ifdef __FreeBSD__ #include -#define je_malloc_stats_print malloc_stats_print #else #include "jemalloc/jemalloc.h" +#ifdef JEMALLOC_NO_RENAME +#define malloc_stats_print je_malloc_stats_print +#endif #endif typedef struct { @@ -48,7 +50,7 @@ void DumpMallocStats(std::string* stats) { std::unique_ptr buf{new char[kMallocStatusLen + 1]}; mstat.cur = buf.get(); mstat.end = buf.get() + kMallocStatusLen; - je_malloc_stats_print(GetJemallocStatus, &mstat, ""); + malloc_stats_print(GetJemallocStatus, &mstat, ""); stats->append(buf.get()); } #else