common/MemoryModel: Alpine is a linux variant but does not implement mallinfo()....

Signed-off-by: John Coyle <dx9err@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35a5104abac0d9e699b5aab2c3ecd76337770616..3a76aa205efd52a7edb86c4f355d1463189c42ce 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ 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_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES("boost/random/discrete_distribution.hpp" HAVE_BOOST_RANDOM_DISCRETE_DISTRIBUTION)
 CHECK_INCLUDE_FILES("dirent.h" HAVE_DIRENT_H)

diff --git a/configure.ac b/configure.ac
index 9bef7677be287222e4f8422ac83011a41d2c2903..9273413182aa8ce198c152686d356bb4d59d93c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -964,6 +964,10 @@ AC_CHECK_FUNC([fallocate],
        [AC_DEFINE([CEPH_HAVE_FALLOCATE], [], [fallocate(2) is supported])],
        [])
 
+# mallinfo
+AC_CHECK_FUNC([mallinfo],
+  [AC_DEFINE(HAVE_MALLINFO, 1, [Define if you have mallinfo])])
+
 # getgrouplist
 AC_CHECK_FUNCS([getgrouplist])
 

diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc
index f737a7b88d6d6e8a2a3b9d4c9086fb566bd87526..ddc7fa94977103dcb33bd96d836539fdf7b40316 100644 (file)
--- a/src/common/MemoryModel.cc
+++ b/src/common/MemoryModel.cc
@@ -1,4 +1,5 @@
 
+#include "acconfig.h"
 #include "include/types.h"
 #include "MemoryModel.h"
 #include "common/config.h"
@@ -92,7 +93,7 @@ void MemoryModel::_sample(snap *psnap)
   psnap->heap = heap >> 10;
 
   // ...
-#if defined(__linux__)
+#if defined(HAVE_MALLINFO)
   struct mallinfo mi = mallinfo();
   
   psnap->malloc = mi.uordblks >> 10;

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 8486d4cd3cd95ebb29448991963b8d677d058f61..0198792a2fe4ee804896ec47ad2c8f38fabeb980 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -6,6 +6,9 @@
 /* fallocate(2) is supported */
 #cmakedefine CEPH_HAVE_FALLOCATE 
 
+/* mallinfo(3) is supported */
+#cmakedefine HAVE_MALLINFO
+
 /* posix_fadvise is supported */
 #cmakedefine HAVE_POSIX_FADVISE