Commit 063c23d9 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

qtest: add qtest_add_abrt_handler() 



Allow a test to add abort handlers, use GHook for all handlers.

There is currently no way to remove a handler, but it could be
later added if needed.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarClaudio Fontana <claudio.fontana@huawei.com>
parent 43b11a91

tests/libqtest.c

+24 −13
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct QTestState 
    pid_t qemu_pid;  /* our child QEMU process */

};



static GHookList abrt_hooks;

static GList *qtest_instances;

static struct sigaction sigact_old;
@@ -111,10 +112,7 @@ static void kill_qemu(QTestState *s) 


static void sigabrt_handler(int signo)

{

    GList *elem;

    for (elem = qtest_instances; elem; elem = elem->next) {

        kill_qemu(elem->data);

    }

    g_hook_list_invoke(&abrt_hooks, FALSE);

}



static void setup_sigabrt_handler(void)
@@ -135,6 +133,23 @@ static void cleanup_sigabrt_handler(void) 
    sigaction(SIGABRT, &sigact_old, NULL);

}



void qtest_add_abrt_handler(void (*fn), const void *data)

{

    GHook *hook;



    /* Only install SIGABRT handler once */

    if (!abrt_hooks.is_setup) {

        g_hook_list_init(&abrt_hooks, sizeof(GHook));

        setup_sigabrt_handler();

    }



    hook = g_hook_alloc(&abrt_hooks);

    hook->func = fn;

    hook->data = (void *)data;



    g_hook_prepend(&abrt_hooks, hook);

}



QTestState *qtest_init(const char *extra_args)

{

    QTestState *s;
@@ -155,12 +170,7 @@ QTestState *qtest_init(const char *extra_args) 
    sock = init_socket(socket_path);

    qmpsock = init_socket(qmp_socket_path);



    /* Only install SIGABRT handler once */

    if (!qtest_instances) {

        setup_sigabrt_handler();

    }



    qtest_instances = g_list_prepend(qtest_instances, s);

    qtest_add_abrt_handler(kill_qemu, s);



    s->qemu_pid = fork();

    if (s->qemu_pid == 0) {
@@ -208,13 +218,14 @@ QTestState *qtest_init(const char *extra_args) 


void qtest_quit(QTestState *s)

{

    qtest_instances = g_list_remove(qtest_instances, s);

    g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));



    /* Uninstall SIGABRT handler on last instance */

    if (qtest_instances && !qtest_instances->next) {

    if (!qtest_instances) {

        cleanup_sigabrt_handler();

    }



    qtest_instances = g_list_remove(qtest_instances, s);



    kill_qemu(s);

    close(s->fd);

    close(s->qmp_fd);

tests/libqtest.h

+2 −0
Original line number Diff line number Diff line
@@ -450,6 +450,8 @@ void qtest_add_data_func(const char *str, const void *data, void (*fn)); 
        g_free(path); \

    } while (0)



void qtest_add_abrt_handler(void (*fn), const void *data);



/**

 * qtest_start:

 * @args: other arguments to pass to QEMU