Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: support mallinfo2()

Browse source 
mallinfo() is deprecated as of glibc 2.33 and emits a warning if used.
Support mallinfo2() if available.

Signed-off-by: Quentin Young <qlyoung@qlyoung.net>
This commit is contained in:
Quentin Young 2021-02-08 01:56:07 -05:00
parent de6223a98d
commit 51ab4dbaad
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -2366,6 +2366,29 @@ if test "$frr_cv_mallinfo" = "yes"; then
AC_DEFINE([HAVE_MALLINFO], [1], [mallinfo]) AC_DEFINE([HAVE_MALLINFO], [1], [mallinfo])
fi fi
AC_CACHE_CHECK([whether mallinfo2 is available], [frr_cv_mallinfo2], [
AC_LINK_IFELSE([AC_LANG_PROGRAM([FRR_INCLUDES [
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#ifdef HAVE_MALLOC_NP_H
#include <malloc_np.h>
#endif
#ifdef HAVE_MALLOC_MALLOC_H
#include <malloc/malloc.h>
#endif
]], [[
struct mallinfo2 ac_x; ac_x = mallinfo2 ();
]])], [
frr_cv_mallinfo2=yes
], [
frr_cv_mallinfo2=no
])
])
if test "$frr_cv_mallinfo2" = "yes"; then
AC_DEFINE([HAVE_MALLINFO2], [1], [mallinfo2])
fi
AC_MSG_CHECKING([whether malloc_usable_size is available]) AC_MSG_CHECKING([whether malloc_usable_size is available])
AC_LINK_IFELSE([AC_LANG_PROGRAM([FRR_INCLUDES [ AC_LINK_IFELSE([AC_LANG_PROGRAM([FRR_INCLUDES [
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H

6
lib/lib_vty.c
View file

@ -43,10 +43,14 @@
#include "vty.h" #include "vty.h"
#include "command.h" #include "command.h"
#ifdef HAVE_MALLINFO #if defined(HAVE_MALLINFO2) || defined(HAVE_MALLINFO)
static int show_memory_mallinfo(struct vty *vty) static int show_memory_mallinfo(struct vty *vty)
{ {
#if defined(HAVE_MALLINFO2)
struct mallinfo2 minfo = mallinfo2();
#elif defined(HAVE_MALLINFO)
struct mallinfo minfo = mallinfo(); struct mallinfo minfo = mallinfo();
#endif
char buf[MTYPE_MEMSTR_LEN]; char buf[MTYPE_MEMSTR_LEN];
vty_out(vty, "System allocator statistics:\n"); vty_out(vty, "System allocator statistics:\n");