denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use mallinfo2() if available

Browse Source 
mallinfo() is deprecated because it uses `int` for the members of the
returned struct, whereas mallinfo2() uses `size_t`.  It's available
since glibc 2.33.
This commit is contained in:
Tobias Brunner
2022-04-25 14:16:20 +02:00
parent 8ce4105fca
commit c9d471091f
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_list.c
+9 -4
View File
@@ -22,9 +22,9 @@
#include <time.h>
#include <sys/utsname.h>
#ifdef HAVE_MALLINFO
#if defined(HAVE_MALLINFO2) || defined (HAVE_MALLINFO)
#include <malloc.h>
#endif /* HAVE_MALLINFO */
#endif
#include <daemon.h>
#include <collections/linked_list.h>
@@ -490,14 +490,19 @@ METHOD(stroke_list_t, status, void,
}
fprintf(out, "):\n uptime: %V, since %T\n", &now, &this->uptime, &since,
FALSE);
#ifdef HAVE_MALLINFO
{
#ifdef HAVE_MALLINFO2
struct mallinfo2 mi = mallinfo2();
fprintf(out, " malloc: sbrk %zu, mmap %zu, used %zu, free %zu\n",
mi.arena, mi.hblkhd, mi.uordblks, mi.fordblks);
#elif defined (HAVE_MALLINFO)
struct mallinfo mi = mallinfo();
fprintf(out, " malloc: sbrk %u, mmap %u, used %u, free %u\n",
mi.arena, mi.hblkhd, mi.uordblks, mi.fordblks);
#endif
}
#endif /* HAVE_MALLINFO */
fprintf(out, " worker threads: %d of %d idle, ",
lib->processor->get_idle_threads(lib->processor),
lib->processor->get_total_threads(lib->processor));
src/libcharon/plugins/vici/vici_query.c
+12 -3
View File
@@ -48,7 +48,7 @@
#ifndef WIN32
#include <sys/utsname.h>
#endif
#ifdef HAVE_MALLINFO
#if defined(HAVE_MALLINFO2) || defined (HAVE_MALLINFO)
#include <malloc.h>
#endif
@@ -1697,8 +1697,17 @@ CALLBACK(stats, vici_message_t*,
}
#endif
#ifdef HAVE_MALLINFO
{
#ifdef HAVE_MALLINFO2
struct mallinfo2 mi = mallinfo2();
b->begin_section(b, "mallinfo");
b->add_kv(b, "sbrk", "%zu", mi.arena);
b->add_kv(b, "mmap", "%zu", mi.hblkhd);
b->add_kv(b, "used", "%zu", mi.uordblks);
b->add_kv(b, "free", "%zu", mi.fordblks);
b->end_section(b);
#elif defined(HAVE_MALLINFO)
struct mallinfo mi = mallinfo();
b->begin_section(b, "mallinfo");
@@ -1707,8 +1716,8 @@ CALLBACK(stats, vici_message_t*,
b->add_kv(b, "used", "%u", mi.uordblks);
b->add_kv(b, "free", "%u", mi.fordblks);
b->end_section(b);
#endif /* HAVE_MALLINFO(2) */
}
#endif /* HAVE_MALLINFO */
return b->finalize(b);
}