Fix build on machines without jemalloc

Summary: It looks like we mistakenly enable JEMALLOC even if it's not available on the machine, that's why travis is failing

Test Plan:
check on my devserver
check on my mac

Reviewers: sdong

Reviewed By: sdong

Subscribers: andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D57345
main
Islam AbdelRahman 9 years ago
parent 4032145adc
commit 0850bc5147
  1. 2
      build_tools/build_detect_platform
  2. 1
      build_tools/fbcode_config.sh
  3. 1
      build_tools/fbcode_config4.8.1.sh
  4. 2
      db/db_impl.cc

@ -453,6 +453,6 @@ echo "ROCKSDB_PATCH=$ROCKSDB_PATCH" >> "$OUTPUT"
echo "CLANG_SCAN_BUILD=$CLANG_SCAN_BUILD" >> "$OUTPUT" echo "CLANG_SCAN_BUILD=$CLANG_SCAN_BUILD" >> "$OUTPUT"
echo "CLANG_ANALYZER=$CLANG_ANALYZER" >> "$OUTPUT" echo "CLANG_ANALYZER=$CLANG_ANALYZER" >> "$OUTPUT"
echo "PROFILING_FLAGS=$PROFILING_FLAGS" >> "$OUTPUT" echo "PROFILING_FLAGS=$PROFILING_FLAGS" >> "$OUTPUT"
if test -z "$JEMALLOC"; then if test -n "$JEMALLOC"; then
echo "JEMALLOC=1" >> "$OUTPUT" echo "JEMALLOC=1" >> "$OUTPUT"
fi fi

@ -61,6 +61,7 @@ CFLAGS+=" -DGFLAGS=google"
# location of jemalloc # location of jemalloc
JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/" JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a" JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a"
JEMALLOC=1
if test -z $PIC_BUILD; then if test -z $PIC_BUILD; then
# location of numa # location of numa

@ -40,6 +40,7 @@ GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags.a"
# location of jemalloc # location of jemalloc
JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include" JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include"
JEMALLOC_LIB="$JEMALLOC_BASE/lib/libjemalloc.a" JEMALLOC_LIB="$JEMALLOC_BASE/lib/libjemalloc.a"
JEMALLOC=1
# location of numa # location of numa
NUMA_INCLUDE=" -I $NUMA_BASE/include/" NUMA_INCLUDE=" -I $NUMA_BASE/include/"

@ -536,6 +536,7 @@ void DBImpl::PrintStatistics() {
} }
} }
#ifndef ROCKSDB_LITE
#ifdef ROCKSDB_JEMALLOC #ifdef ROCKSDB_JEMALLOC
typedef struct { typedef struct {
char* cur; char* cur;
@ -566,6 +567,7 @@ static void DumpMallocStats(std::string* stats) {
stats->append(buf.get()); stats->append(buf.get());
#endif // ROCKSDB_JEMALLOC #endif // ROCKSDB_JEMALLOC
} }
#endif // !ROCKSDB_LITE
void DBImpl::MaybeDumpStats() { void DBImpl::MaybeDumpStats() {
if (db_options_.stats_dump_period_sec == 0) return; if (db_options_.stats_dump_period_sec == 0) return;

Loading…
Cancel
Save