]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: disable mallinfo for jemalloc 12469/head
authorBassam Tabbara <bassam.tabbara@quantum.com>
Mon, 12 Dec 2016 22:16:40 +0000 (17:16 -0500)
committerBassam Tabbara <bassam.tabbara@quantum.com>
Tue, 13 Dec 2016 14:58:45 +0000 (09:58 -0500)
jemalloc does not implement mallinfo. Only check for existence
of mallinfo when the allocator is not jemalloc.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
CMakeLists.txt

index c70e6648a1389c1aa6cbec646aceba3a511a7b8c..1b41d0fa0b379f219911348da92d70cd0cfa5e53 100644 (file)
@@ -97,7 +97,6 @@ CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE)
 CHECK_FUNCTION_EXISTS(posix_fallocate HAVE_POSIX_FALLOCATE)
 CHECK_FUNCTION_EXISTS(syncfs HAVE_SYS_SYNCFS)
 CHECK_FUNCTION_EXISTS(sync_file_range HAVE_SYNC_FILE_RANGE)
-CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
 CHECK_FUNCTION_EXISTS(pwritev HAVE_PWRITEV)
 CHECK_FUNCTION_EXISTS(splice CEPH_HAVE_SPLICE)
 CHECK_FUNCTION_EXISTS(getgrouplist HAVE_GETGROUPLIST)
@@ -285,6 +284,11 @@ else(ALLOCATOR)
   endif(GPERFTOOLS_FOUND)
 endif(ALLOCATOR)
 
+# jemalloc does not support mallinfo
+if(NOT JEMALLOC_FOUND)
+  CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
+endif()
+
 if(WITH_LIBCEPHFS OR WITH_RBD)
   find_package(keyutils REQUIRED)
 endif()