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

Not enable jemalloc status printing if USE_CLANG=1

Browse Source 
Summary: Warning is printed out with USE_CLANG=1 when including jemalloc.h. Disable it in that case.

Test Plan: Run db_bench with USE_CLANG=1 and not. Make sure they can all build and jemalloc status is printed out in the case where USE_CLANG is not set.

Reviewers: andrewkr, IslamAbdelRahman

Reviewed By: IslamAbdelRahman

Subscribers: leveldb, andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D57399
This commit is contained in:
sdong 2016-04-28 16:04:31 -07:00
parent 029022b0f1
commit 992a8f83b7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_tools/fbcode_config.sh
View File

@ -61,7 +61,6 @@ CFLAGS+=" -DGFLAGS=google"
# location of jemalloc
JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a"
JEMALLOC=1
if test -z $PIC_BUILD; then
# location of numa
@ -98,6 +97,7 @@ if [ -z "$USE_CLANG" ]; then
CFLAGS+=" -B$BINUTILS/gold"
CFLAGS+=" -isystem $GLIBC_INCLUDE"
CFLAGS+=" -isystem $LIBGCC_INCLUDE"
JEMALLOC=1
else
# clang
CLANG_INCLUDE="$CLANG_LIB/clang/*/include"

2
build_tools/fbcode_config4.8.1.sh
View File

@ -40,7 +40,6 @@ GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags.a"
# location of jemalloc
JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include"
JEMALLOC_LIB="$JEMALLOC_BASE/lib/libjemalloc.a"
JEMALLOC=1
# location of numa
NUMA_INCLUDE=" -I $NUMA_BASE/include/"
@ -67,6 +66,7 @@ if [ -z "$USE_CLANG" ]; then
CFLAGS="-B$BINUTILS/gold -m64 -mtune=generic"
CFLAGS+=" -isystem $GLIBC_INCLUDE"
CFLAGS+=" -isystem $LIBGCC_INCLUDE"
JEMALLOC=1
else
# clang
CLANG_BIN="$CLANG_BASE/bin"

2
db/db_impl.cc
View File

@ -551,7 +551,7 @@ static void GetJemallocStatus(void* mstat_arg, const char* status) {
return;
}
snprintf(mstat->cur, buf_size, status);
snprintf(mstat->cur, buf_size, "%s", status);
mstat->cur += status_len;
}
#endif // ROCKSDB_JEMALLOC