Skip to content

Commit

Permalink
Fix compile error with jemalloc (#4488)
Browse files Browse the repository at this point in the history
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: #4488

Differential Revision: D10355971

Pulled By: yiwu-arbug

fbshipit-source-id: 03a2d69790a44ac89219c7525763fa937a63d95a
  • Loading branch information
Yi Wu authored and facebook-github-bot committed Oct 12, 2018
1 parent 6422356 commit 6f8d4bd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions db/malloc_stats.cc
Expand Up @@ -18,9 +18,11 @@ namespace rocksdb {
#ifdef ROCKSDB_JEMALLOC
#ifdef __FreeBSD__
#include <malloc_np.h>
#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 {
Expand Down Expand Up @@ -48,7 +50,7 @@ void DumpMallocStats(std::string* stats) {
std::unique_ptr<char[]> 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
Expand Down

0 comments on commit 6f8d4bd

Please sign in to comment.