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.

Sign up for GitHub

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

Jump to bottom

Feature/jemalloc 5.0.1 #2991

Merged
merged 6 commits into from
Aug 10, 2017
Merged

Feature/jemalloc 5.0.1 #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a0a549
dirty test of jemalloc 5.0.1
jsteemann Aug 1, 2017
5a91251
remove some garbage
jsteemann Aug 8, 2017
a4f2ff2
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
jsteemann Aug 8, 2017
6db79a8
add proper dependencies
jsteemann Aug 8, 2017
ccb7bed
updated CHANGELOG
jsteemann Aug 8, 2017
8d120c9
Merge branch 'devel' into feature/jemalloc-5.0.1
fceller Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions 3rdParty/jemalloc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(jemalloc C)
include(ExternalProject)

# set version and paths
set(JEMALLOC_VERSION "4.5.0")
set(JEMALLOC_VERSION "5.0.1")
# set(JEMALLOC_VERSION "3.6.0")
set(JEMALLOC_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/v${JEMALLOC_VERSION}")
set(JEMALLOC_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/v${JEMALLOC_VERSION}")
Expand Down Expand Up @@ -58,8 +58,8 @@ if (LINUX OR DARWIN)
CXX=${JEMALLOC_CXX_TMP}
CFLAGS=${JEMALLOC_CFLAGS_TMP}
CXXFLAGS=${JEMALLOC_CXXFLAGS_TMP}
--enable-munmap
--prefix=${CMAKE_CURRENT_BINARY_DIR}
--with-malloc-conf=background_thread:true
--with-version=${JEMALLOC_VERSION}-0-g0
BUILD_COMMAND
make build_lib_static
Expand All @@ -70,4 +70,6 @@ if (LINUX OR DARWIN)
&& mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/lib
&& cp -a ${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a ${CMAKE_CURRENT_BINARY_DIR}/lib
)

set(JEMALLOC_LIB "${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a" PARENT_SCOPE)
endif ()
72 changes: 0 additions & 72 deletions 3rdParty/jemalloc/v3.6.0/.gitignore
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions 3rdParty/jemalloc/v3.6.0/COPYING
View file
Open in desktop

This file was deleted.

Loading