sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

vici: Don't report memory usage via leak-detective

Browse Source 
This slowed down the `swanctl --stats` calls in the test scenarios
significantly, with not much added value.
This commit is contained in:
Tobias Brunner 2015-11-19 17:56:06 +01:00 committed by Andreas Steffen
parent ae37090e65
commit 74270c8c86
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcharon/plugins/vici/vici_query.c
View 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];

1
testing/do-tests
View File

@ -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