OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

libqtest: add qtest_remove_abrt_handler()

Browse Source 
Add a function to remove previously-added abrt handler functions.

Now that a symmetric pair of add/remove functions exists we can also
balance the SIGABRT handler installation. The signal handler was
installed each time qtest_add_abrt_handler() was called. Now it is
installed when the abrt handler list becomes non-empty and removed again
when the list becomes empty.

The qtest_remove_abrt_handler() function will be used by
vhost-user-blk-test.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210223144653.811468-5-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2021-02-23 14:46:45 +00:00 committed by Kevin Wolf
parent 7a23c52376
commit e1fa7f5591
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/qtest/libqos/libqtest.h
View File

@ -649,8 +649,26 @@ void qtest_add_data_func_full(const char *str, void *data,
g_free(path); \
} while (0)
/**
* qtest_add_abrt_handler:
* @fn: Handler function
* @data: Argument that is passed to the handler
*
* Add a handler function that is invoked on SIGABRT. This can be used to
* terminate processes and perform other cleanup. The handler can be removed
* with qtest_remove_abrt_handler().
*/
void qtest_add_abrt_handler(GHookFunc fn, const void *data);
/**
* qtest_remove_abrt_handler:
* @data: Argument previously passed to qtest_add_abrt_handler()
*
* Remove an abrt handler that was previously added with
* qtest_add_abrt_handler().
*/
void qtest_remove_abrt_handler(void *data);
/**
* qtest_qmp_assert_success:
* @qts: QTestState instance to operate on

33
tests/qtest/libqtest.c
View File

@ -196,15 +196,30 @@ static void cleanup_sigabrt_handler(void)
sigaction(SIGABRT, &sigact_old, NULL);
}
static bool hook_list_is_empty(GHookList *hook_list)
{
GHook *hook = g_hook_first_valid(hook_list, TRUE);
if (!hook) {
return false;
}
g_hook_unref(hook_list, hook);
return true;
}
void qtest_add_abrt_handler(GHookFunc fn, const void *data)
{
GHook *hook;
/* Only install SIGABRT handler once */
if (!abrt_hooks.is_setup) {
g_hook_list_init(&abrt_hooks, sizeof(GHook));
}
/* Only install SIGABRT handler once */
if (hook_list_is_empty(&abrt_hooks)) {
setup_sigabrt_handler();
}
hook = g_hook_alloc(&abrt_hooks);
hook->func = fn;
@ -213,6 +228,17 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data)
g_hook_prepend(&abrt_hooks, hook);
}
void qtest_remove_abrt_handler(void *data)
{
GHook *hook = g_hook_find_data(&abrt_hooks, TRUE, data);
g_hook_destroy_link(&abrt_hooks, hook);
/* Uninstall SIGABRT handler on last instance */
if (hook_list_is_empty(&abrt_hooks)) {
cleanup_sigabrt_handler();
}
}
static const char *qtest_qemu_binary(void)
{
const char *qemu_bin;
@ -369,10 +395,7 @@ QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd)
void qtest_quit(QTestState *s)
{
g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));
/* Uninstall SIGABRT handler on last instance */
cleanup_sigabrt_handler();
qtest_remove_abrt_handler(s);
qtest_kill_qemu(s);
close(s->fd);