Commit 55b30fc4 authored by Georgios Bitzes's avatar Georgios Bitzes
Browse files

Stop linking the xrootd plugin with jemalloc, except on CC7

parent 63524a5f
Pipeline #1385822 passed with stages
in 55 minutes and 54 seconds
......@@ -17,7 +17,7 @@ connections.
- Automatic fsync of the raft journal once per second.
- Better cluster resilience in case of sudden machine powercuts.
Thanks to Franck Eyraud (JRC) for the bug reports relating to shudden poweroff, and valuable discussion on fsync behavior.
Thanks to Franck Eyraud (JRC) for the bug reports relating to sudden poweroff, and valuable discussion on fsync behavior.
## 0.4.0 (2019-12-06)
......
......@@ -55,6 +55,11 @@ else()
set(BUILDING_WITH_TSAN FALSE)
endif()
#-------------------------------------------------------------------------------
# Link the xrootd library with jemalloc?
#-------------------------------------------------------------------------------
option(XROOTD_JEMALLOC "Link xrootd library with jemalloc?" OFF)
#-------------------------------------------------------------------------------
# Look inside the rocksdb cache, which is used to greatly reduce compilation
# time of QuarkDB.
......
......@@ -7,6 +7,9 @@
%if 0%{distribution} == 7
%global __strip /opt/rh/devtoolset-8/root/bin/strip
%define xrootd_jemalloc 1
%else
%define xrootd_jemalloc 0
%endif
#-------------------------------------------------------------------------------
......@@ -69,7 +72,7 @@ source /opt/rh/devtoolset-8/enable
mkdir build
cd build
%{cmake_cmd} ../ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/usr @ROCKSDB_CACHED_BUILD@
%{cmake_cmd} ../ -DXROOTD_JEMALLOC=%{xrootd_jemalloc} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/usr @ROCKSDB_CACHED_BUILD@
%{__make}
%install
......
......@@ -113,10 +113,10 @@ add_library(XrdQuarkDB SHARED
${BACKWARD_ENABLE}
)
if(BUILDING_WITH_TSAN)
set(JEMALLOC_LIBS "")
else()
if(XROOTD_JEMALLOC AND NOT BUILDING_WITH_TSAN)
set(JEMALLOC_LIBS jemalloc)
else()
set(JEMALLOC_LIBS "")
endif()
target_link_libraries(
......
......@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
find_package (Threads)
add_executable(quarkdb-server quarkdb-server.cc)
target_link_libraries(quarkdb-server XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
target_link_libraries(quarkdb-server jemalloc XrdQuarkDB ${CMAKE_THREAD_LIBS_INIT} )
add_executable(quarkdb-create quarkdb-create.cc)
target_link_libraries(quarkdb-create XrdQuarkDB)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment