From 74270c8c86ac8a25e7d70ee84b1686afdce32776 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 19 Nov 2015 17:56:06 +0100 Subject: [PATCH] vici: Don't report memory usage via leak-detective This slowed down the `swanctl --stats` calls in the test scenarios significantly, with not much added value. --- src/libcharon/plugins/vici/vici_query.c | 17 ----------------- testing/do-tests | 1 - 2 files changed, 18 deletions(-) diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c index ef4d4e3..86440df 100644 --- a/src/libcharon/plugins/vici/vici_query.c +++ b/src/libcharon/plugins/vici/vici_query.c @@ -1020,18 +1020,6 @@ CALLBACK(version, vici_message_t*, return b->finalize(b); } -/** - * Callback function for memusage summary - */ -CALLBACK(sum_usage, void, - vici_builder_t *b, int count, size_t bytes, int whitelisted) -{ - b->begin_section(b, "mem"); - b->add_kv(b, "total", "%zu", bytes); - b->add_kv(b, "allocs", "%d", count); - b->end_section(b); -} - CALLBACK(stats, vici_message_t*, private_vici_query_t *this, char *name, u_int id, vici_message_t *request) { @@ -1093,12 +1081,7 @@ CALLBACK(stats, vici_message_t*, enumerator->destroy(enumerator); b->end_list(b); - if (lib->leak_detective) - { - lib->leak_detective->usage(lib->leak_detective, NULL, sum_usage, b); - } #ifdef WIN32 - else { DWORD lasterr = ERROR_INVALID_HANDLE; HANDLE heaps[32]; diff --git a/testing/do-tests b/testing/do-tests index c87ba05..5c30741 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -537,7 +537,6 @@ do > $TESTRESULTDIR/${host}.swanctl.$subsys 2>/dev/null done - # this is quite slow due to allocation stats via leak-detective ssh $SSHCONF $HOSTLOGIN swanctl --stats \ > $TESTRESULTDIR/${host}.swanctl.stats 2>/dev/null else -- 2.7.4