Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to disable jemalloc when compiling #436

Merged
merged 4 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/run-ci-without-jemalloc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: run ci without jemalloc

on:
schedule:
# Daily run this action at 1am
- cron: '0 1 * * *'
pull_request:
types: [labeled]

jobs:
build-on-ubuntu-without-jemalloc:
strategy:
matrix:
os: [ubuntu-18.04]

if: ${{ github.event.label.name == 'run ci without jemalloc' }}
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Code Base
uses: actions/checkout@v2.3.4
with:
fetch-depth: 64

- name: Build
run: |
git submodule init && git submodule update
mkdir _build && cd _build
cmake -DDISABLE_JEMALLOC=true -DCMAKE_BUILD_TYPE=Release ..
make -j4 kvrocks kvrocks2redis
cp kvrocks ../src && cd ..

- name: Redis Tcl Test
run: |
sudo apt-get install tcl8.5
cd tests/tcl && sh runtest && cd -
16 changes: 11 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@ if (REALTIME_LIB)
list(APPEND EXTERNAL_LIBS PRIVATE rt)
endif()

include(cmake/jemalloc.cmake)
include(cmake/glog.cmake)
include(cmake/snappy.cmake)
include(cmake/rocksdb.cmake)
include(cmake/libevent.cmake)
include(cmake/lua.cmake)

list(APPEND EXTERNAL_LIBS PRIVATE ${jemalloc_LIBRARIES})
list(APPEND EXTERNAL_INCS PRIVATE ${jemalloc_INCLUDE_DIRS})
if(NOT DISABLE_JEMALLOC)
include(cmake/jemalloc.cmake)
list(APPEND EXTERNAL_LIBS PRIVATE ${jemalloc_LIBRARIES})
list(APPEND EXTERNAL_INCS PRIVATE ${jemalloc_INCLUDE_DIRS})
endif()

list(APPEND EXTERNAL_LIBS PRIVATE ${glog_LIBRARIES})
list(APPEND EXTERNAL_INCS PRIVATE ${glog_INCLUDE_DIRS})
Expand Down Expand Up @@ -65,7 +67,11 @@ if(ENBALE_ASAN)
target_compile_options(kvrocks PRIVATE -fsanitize=address)
target_link_libraries(kvrocks PRIVATE -fsanitize=address)
endif()
add_dependencies(kvrocks jemalloc libevent glog snappy rocksdb lua)
add_dependencies(kvrocks libevent glog snappy rocksdb lua)
if(NOT DISABLE_JEMALLOC)
add_dependencies(kvrocks jemalloc)
endif()

target_include_directories(kvrocks PRIVATE ${PROJECT_BINARY_DIR})
target_include_directories(kvrocks ${EXTERNAL_INCS})
find_package(Threads REQUIRED)
Expand Down Expand Up @@ -361,7 +367,7 @@ add_executable(unittest
src/rand.cc
src/rand.h)

add_dependencies(unittest glog rocksdb snappy jemalloc lua)
add_dependencies(unittest glog rocksdb snappy lua)
target_compile_features(unittest PRIVATE cxx_std_11)
message(${snappy_LIBRARIES})
target_link_libraries(unittest PRIVATE ${EXTERNAL_LIBS} -lgtest)
Expand Down
13 changes: 10 additions & 3 deletions cmake/rocksdb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,23 @@ if (NOT __ROCKSDB_INCLUDED)
set(rocksdb_PREFIX ${CMAKE_BUILD_DIRECTORY}/external/rocksdb-prefix)
# install directory
set(rocksdb_INSTALL ${CMAKE_BUILD_DIRECTORY}/external/rocksdb-install)
set(COMPILE_WITH_JEMALLOC ON)

if (UNIX)
set(ROCKSDB_EXTRA_COMPILER_FLAGS "-fPIC")
endif()

set(ROCKSDB_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROCKSDB_EXTRA_COMPILER_FLAGS}")
set(ROCKSDB_C_FLAGS "${CMAKE_C_FLAGS} ${ROCKSDB_EXTRA_COMPILER_FLAGS}")
set(JEMALLOC_ROOT_DIR ${jemalloc_INSTALL})
if (NOT DISABLE_JEMALLOC)
set(ROCKSDB_DEPENDS "jemalloc snappy")
set(JEMALLOC_ROOT_DIR ${jemalloc_INSTALL})
else()
set(rocksdb_DEPENDS "snappy")
set(COMPILE_WITH_JEMALLOC OFF)
endif()
ExternalProject_Add(rocksdb
DEPENDS jemalloc snappy
DEPENDS ${rocksdb_DEPENDS}
PREFIX ${rocksdb_PREFIX}
#GIT_REPOSITORY "https://github.com/facebook/rocksdb"
#GIT_TAG "v5.15.10"
Expand All @@ -42,7 +49,7 @@ if (NOT __ROCKSDB_INCLUDED)
-DWITH_TOOLS=OFF
-DWITH_GFLAGS=OFF
-DUSE_RTTI=ON
-DWITH_JEMALLOC=ON
-DWITH_JEMALLOC=${COMPILE_WITH_JEMALLOC}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_INSTALL 1
Expand Down
16 changes: 13 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ ROCKSDB= $(ROCKSDB_PATH)/librocksdb.a
LUA_PATH= $(EXTERNAL_LIBRARY_PATH)/lua
LUA= $(LUA_PATH)/src/liblua.a
# Include paths to dependencies
FINAL_CXXFLAGS+= -I$(JEMALLOC_PATH)/include \
-I$(ROCKSDB_PATH)/include \
FINAL_CXXFLAGS+= -I$(ROCKSDB_PATH)/include \
-I$(LIBEVENT_PATH)/include \
-I$(GLOG_PATH)/src \
-I$(LUA_PATH)/src \
-I.
FINAL_LIBS+= $(GLOG) $(LIBEVENT) $(LIBEVENT_PTHREADS) $(JEMALLOC) $(ROCKSDB) $(LUA)
FINAL_LIBS+= $(GLOG) $(LIBEVENT) $(LIBEVENT_PTHREADS) $(ROCKSDB) $(LUA)

ifndef DISABLE_JEMALLOC
FINAL_CXXFLAGS+= -I$(JEMALLOC_PATH)/include
FINAL_LIBS+= $(JEMALLOC)
endif

SHARED_OBJS= cluster.o compact_filter.o config.o cron.o encoding.o event_listener.o lock_manager.o \
log_collector.o redis_bitmap.o redis_bitmap_string.o redis_cmd.o redis_connection.o redis_db.o \
Expand Down Expand Up @@ -104,10 +108,16 @@ $(LIBEVENT):
./configure --enable-shared=no --disable-openssl; \
$(MAKE) -C $(LIBEVENT_PATH)/

ifdef DISABLE_JEMALLOC
$(ROCKSDB):
export ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_LZ4=1; \
$(MAKE) USE_RTTI=1 PORTABLE=1 -C $(ROCKSDB_PATH)/ static_lib
else
$(ROCKSDB): $(JEMALLOC)
export ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_LZ4=1; \
export JEMALLOC=1 JEMALLOC_INCLUDE=-I$(JEMALLOC_PATH)/include JEMALLOC_LIB=$(JEMALLOC); \
$(MAKE) USE_RTTI=1 PORTABLE=1 -C $(ROCKSDB_PATH)/ static_lib
endif

$(JEMALLOC):
cd $(JEMALLOC_PATH); ./autogen.sh; \
Expand Down