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

leak-detective: print total of allocated/leaked bytes in usage/report

Browse Source
This commit is contained in:
Martin Willi
2013-07-12 20:00:14 +02:00
parent 783b55cc5c
commit c93cf85356
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/leak_detective.c
+13 -5
View File
@@ -599,7 +599,7 @@ static bool equals(backtrace_t *a, backtrace_t *b)
*/ */
static int print_traces(private_leak_detective_t *this, static int print_traces(private_leak_detective_t *this,
FILE *out, int thresh, int thresh_count, FILE *out, int thresh, int thresh_count,
bool detailed, int *whitelisted) bool detailed, int *whitelisted, size_t *sum)
{ {
int leaks = 0; int leaks = 0;
memory_header_t *hdr; memory_header_t *hdr;
@@ -644,6 +644,10 @@ static int print_traces(private_leak_detective_t *this,
); );
entries->put(entries, entry->backtrace, entry); entries->put(entries, entry->backtrace, entry);
} }
if (sum)
{
*sum += hdr->bytes;
}
leaks++; leaks++;
} }
lock->unlock(lock); lock->unlock(lock);
@@ -674,8 +678,9 @@ METHOD(leak_detective_t, report, void,
if (lib->leak_detective) if (lib->leak_detective)
{ {
int leaks, whitelisted = 0; int leaks, whitelisted = 0;
size_t sum = 0;
leaks = print_traces(this, stderr, 0, 0, detailed, &whitelisted); leaks = print_traces(this, stderr, 0, 0, detailed, &whitelisted, &sum);
switch (leaks) switch (leaks)
{ {
case 0: case 0:
@@ -685,7 +690,7 @@ METHOD(leak_detective_t, report, void,
fprintf(stderr, "One leak detected"); fprintf(stderr, "One leak detected");
break; break;
default: default:
fprintf(stderr, "%d leaks detected", leaks); fprintf(stderr, "%d leaks detected, %zu bytes", leaks, sum);
break; break;
} }
fprintf(stderr, ", %d suppressed by whitelist\n", whitelisted); fprintf(stderr, ", %d suppressed by whitelist\n", whitelisted);
@@ -703,7 +708,7 @@ METHOD(leak_detective_t, leaks, int,
{ {
int leaks, whitelisted = 0; int leaks, whitelisted = 0;
leaks = print_traces(this, NULL, 0, 0, FALSE, &whitelisted); leaks = print_traces(this, NULL, 0, 0, FALSE, &whitelisted, NULL);
return leaks; return leaks;
} }
return 0; return 0;
@@ -720,6 +725,7 @@ METHOD(leak_detective_t, usage, void,
{ {
bool detailed; bool detailed;
int thresh, thresh_count; int thresh, thresh_count;
size_t sum = 0;
thresh = lib->settings->get_int(lib->settings, thresh = lib->settings->get_int(lib->settings,
"libstrongswan.leak_detective.usage_threshold", 10240); "libstrongswan.leak_detective.usage_threshold", 10240);
@@ -728,7 +734,9 @@ METHOD(leak_detective_t, usage, void,
detailed = lib->settings->get_bool(lib->settings, detailed = lib->settings->get_bool(lib->settings,
"libstrongswan.leak_detective.detailed", TRUE); "libstrongswan.leak_detective.detailed", TRUE);
print_traces(this, out, thresh, thresh_count, detailed, NULL); print_traces(this, out, thresh, thresh_count, detailed, NULL, &sum);
fprintf(out, "Total memory usage: %zu\n", sum);
} }
/** /**