You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/01/07 21:29:53 UTC
arrow git commit: ARROW-463: C++: Support jemalloc 4.x
Repository: arrow
Updated Branches:
refs/heads/master 7d1f1cf91 -> 1094d89d4
ARROW-463: C++: Support jemalloc 4.x
This also fixes some minor bugs in the CMakeLists for jemalloc.
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #273 from xhochy/ARROW-463 and squashes the following commits:
d12a97c [Uwe L. Korn] ARROW-463: C++: Support jemalloc 4.x
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/1094d89d
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/1094d89d
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/1094d89d
Branch: refs/heads/master
Commit: 1094d89d4094ab3209c2df15826d8e7d3758df97
Parents: 7d1f1cf
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Sat Jan 7 16:29:46 2017 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sat Jan 7 16:29:46 2017 -0500
----------------------------------------------------------------------
cpp/CMakeLists.txt | 4 +++-
cpp/src/arrow/jemalloc/memory_pool.cc | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/1094d89d/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 419691b..3522e5c 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -244,7 +244,7 @@ endfunction()
# A wrapper for target_link_libraries() that is compatible with NO_BENCHMARKS.
function(ARROW_BENCHMARK_LINK_LIBRARIES REL_BENCHMARK_NAME)
- if(NO_TESTS)
+ if(NO_BENCHMARKS)
return()
endif()
get_filename_component(BENCHMARK_NAME ${REL_BENCHMARK_NAME} NAME_WE)
@@ -595,6 +595,8 @@ include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR})
if (ARROW_JEMALLOC)
find_package(jemalloc REQUIRED)
+
+ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIR})
ADD_THIRDPARTY_LIB(jemalloc
SHARED_LIB ${JEMALLOC_SHARED_LIB})
endif()
http://git-wip-us.apache.org/repos/asf/arrow/blob/1094d89d/cpp/src/arrow/jemalloc/memory_pool.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/jemalloc/memory_pool.cc b/cpp/src/arrow/jemalloc/memory_pool.cc
index acc09c7..c568316 100644
--- a/cpp/src/arrow/jemalloc/memory_pool.cc
+++ b/cpp/src/arrow/jemalloc/memory_pool.cc
@@ -19,6 +19,8 @@
#include <sstream>
+// Needed to support jemalloc 3 and 4
+#define JEMALLOC_MANGLE
#include <jemalloc/jemalloc.h>
#include "arrow/status.h"