fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_dbus_test_oom_handling: print TAP diagnostics

Browse source 
These aren't *that* verbose, so it seems OK to print them all the time,
not just in the needlessly spammy verbose mode.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2017-11-28 13:29:58 +00:00
parent 5c91d85f3e
commit c58238f53f
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dbus/dbus-internals.c
View file

@ -26,6 +26,7 @@
#include "dbus-protocol.h"
#include "dbus-marshal-basic.h"
#include "dbus-test.h"
#include "dbus-test-tap.h"
#include "dbus-valgrind-internal.h"
#include <stdio.h>
#include <stdarg.h>
@ -1044,15 +1045,15 @@ _dbus_test_oom_handling (const char *description,
_dbus_set_fail_alloc_counter (_DBUS_INT_MAX);
_dbus_verbose ("Running once to count mallocs\n");
_dbus_test_diag ("Running \"%s\" once to count mallocs", description);
if (!(* func) (data, TRUE))
return FALSE;
approx_mallocs = _DBUS_INT_MAX - _dbus_get_fail_alloc_counter ();
_dbus_verbose ("\n=================\n%s: about %d mallocs total\n=================\n",
description, approx_mallocs);
_dbus_test_diag ("\"%s\" has about %d mallocs in total",
description, approx_mallocs);
setting = _dbus_getenv ("DBUS_TEST_MALLOC_FAILURES");
if (setting != NULL)
@ -1072,21 +1073,26 @@ _dbus_test_oom_handling (const char *description,
if (max_failures_to_try < 1)
{
_dbus_verbose ("not testing OOM handling\n");
_dbus_test_diag ("not testing OOM handling");
return TRUE;
}
_dbus_test_diag ("testing \"%s\" with up to %d consecutive malloc failures",
description, max_failures_to_try);
i = setting ? max_failures_to_try - 1 : 1;
while (i < max_failures_to_try)
{
_dbus_test_diag ("testing \"%s\" with %d consecutive malloc failures",
description, i + 1);
_dbus_set_fail_alloc_failures (i);
if (!run_failing_each_malloc (approx_mallocs, description, func, data))
return FALSE;
++i;
}
_dbus_verbose ("\n=================\n%s: all iterations passed\n=================\n",
description);
_dbus_verbose ("\"%s\" coped OK with malloc failures", description);
return TRUE;
}