ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Show mallinfo() data in statusall, if available

This commit is contained in:
Martin Willi 2010-07-06 16:26:59 +02:00
parent 380106ab0d
commit 4f99093235
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -336,6 +336,8 @@ LIBS=$saved_LIBS
AC_CHECK_FUNCS(prctl)
AC_CHECK_FUNCS(mallinfo)
AC_CHECK_HEADERS(sys/sockio.h)
AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h)

13
src/libcharon/plugins/stroke/stroke_list.c
View File

@ -17,6 +17,10 @@
#include <time.h>
#ifdef HAVE_MALLINFO
#include <malloc.h>
#endif /* HAVE_MALLINFO */
#include <daemon.h>
#include <utils/linked_list.h>
#include <credentials/certificates/x509.h>
@ -404,12 +408,19 @@ static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bo
u_int32_t dpd;
time_t since, now;
u_int size, online, offline;
now = time_monotonic(NULL);
since = time(NULL) - (now - this->uptime);
fprintf(out, "Status of IKEv2 charon daemon (strongSwan "VERSION"):\n");
fprintf(out, " uptime: %V, since %T\n", &now, &this->uptime, &since, FALSE);
#ifdef HAVE_MALLINFO
{
struct mallinfo mi = mallinfo();
fprintf(out, " malloc: sbrk %d, mmap %d, used %d, free %d\n",
mi.arena, mi.hblkhd, mi.uordblks, mi.fordblks);
}
#endif /* HAVE_MALLINFO */
fprintf(out, " worker threads: %d idle of %d,",
charon->processor->get_idle_threads(charon->processor),
charon->processor->get_total_threads(charon->processor));