vici: Don't report memory usage via leak-detective
authorTobias Brunner <tobias@strongswan.org>
Thu, 19 Nov 2015 16:56:06 +0000 (17:56 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 11 Dec 2015 17:26:53 +0000 (18:26 +0100)
This slowed down the `swanctl --stats` calls in the test scenarios
significantly, with not much added value.

src/libcharon/plugins/vici/vici_query.c
testing/do-tests

index ef4d4e3..86440df 100644 (file)
@@ -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];
index c87ba05..5c30741 100755 (executable)
@@ -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