Prefer mallinfo2() over deprecated mallinfo() in AFunction.cpp

Author: prj-

AutoGeneratedFile.tar.gz

@@ -2058,7 +2058,7 @@ fi
 AC_CHECK_HEADERS(malloc.h,ff_malloc_h=1)
 AC_SUBST(FF_MALLOC_H,$ff_malloc_h)
 
-AC_CHECK_FUNCS(asinh acosh atanh getenv jn erfc tgamma gettimeofday mallinfo mstats)
+AC_CHECK_FUNCS(asinh acosh atanh getenv jn erfc tgamma gettimeofday mallinfo2 mallinfo mstats)
 AC_CHECK_FUNCS(srandomdev)
 
 

configure.ac

@@ -84,6 +84,10 @@ long storageused()
     struct mstats mem1;
     mem1 = mstats();
     return mem1.bytes_used;
+#elif HAVE_MALLINFO2
+    struct mallinfo2 mem1;
+    mem1=mallinfo2();
+    return static_cast<long>(mem1.uordblks);
 #elif HAVE_MALLINFO
     struct mallinfo mem1;
     mem1=mallinfo();
@@ -99,6 +103,10 @@ long storagetotal()
     struct mstats mem1;
     mem1 = mstats();
     return mem1.bytes_total;
+#elif HAVE_MALLINFO2
+    struct mallinfo2 mem1;
+    mem1=mallinfo2();
+    return static_cast<long>(mem1.keepcost);
 #elif HAVE_MALLINFO
     struct mallinfo mem1;
     mem1=mallinfo();