xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-25 04:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qtest: Keep list of qtest instances for SIGABRT handler

Browse Source 
Keep track of active qtest instances so we can kill them when the test
aborts.  This ensures no QEMU processes are left running after test
failure.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Stefan Hajnoczi 2014-03-27 15:09:50 +01:00 committed by Andreas Färber
parent 96b8ca47f8
commit d766825190
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/libqtest.c
View File

@ -48,6 +48,9 @@ struct QTestState
struct sigaction sigact_old; /* restored on exit */ struct sigaction sigact_old; /* restored on exit */
}; };
static GList *qtest_instances;
static struct sigaction sigact_old;
#define g_assert_no_errno(ret) do { \ #define g_assert_no_errno(ret) do { \
g_assert_cmpint(ret, !=, -1); \ g_assert_cmpint(ret, !=, -1); \
} while (0) } while (0)
@ -104,7 +107,28 @@ static void kill_qemu(QTestState *s)
static void sigabrt_handler(int signo) static void sigabrt_handler(int signo)
{ {
kill_qemu(global_qtest); GList *elem;
for (elem = qtest_instances; elem; elem = elem->next) {
kill_qemu(elem->data);
}
}
static void setup_sigabrt_handler(void)
{
struct sigaction sigact;
/* Catch SIGABRT to clean up on g_assert() failure */
sigact = (struct sigaction){
.sa_handler = sigabrt_handler,
.sa_flags = SA_RESETHAND,
};
sigemptyset(&sigact.sa_mask);
sigaction(SIGABRT, &sigact, &sigact_old);
}
static void cleanup_sigabrt_handler(void)
{
sigaction(SIGABRT, &sigact_old, NULL);
} }
QTestState *qtest_init(const char *extra_args) QTestState *qtest_init(const char *extra_args)
@ -115,7 +139,6 @@ QTestState *qtest_init(const char *extra_args)
gchar *qmp_socket_path; gchar *qmp_socket_path;
gchar *command; gchar *command;
const char *qemu_binary; const char *qemu_binary;
struct sigaction sigact;
qemu_binary = getenv("QTEST_QEMU_BINARY"); qemu_binary = getenv("QTEST_QEMU_BINARY");
g_assert(qemu_binary != NULL); g_assert(qemu_binary != NULL);
@ -128,13 +151,12 @@ QTestState *qtest_init(const char *extra_args)
sock = init_socket(socket_path); sock = init_socket(socket_path);
qmpsock = init_socket(qmp_socket_path); qmpsock = init_socket(qmp_socket_path);
/* Catch SIGABRT to clean up on g_assert() failure */ /* Only install SIGABRT handler once */
sigact = (struct sigaction){ if (!qtest_instances) {
.sa_handler = sigabrt_handler, setup_sigabrt_handler();
.sa_flags = SA_RESETHAND, }
};
sigemptyset(&sigact.sa_mask); qtest_instances = g_list_prepend(qtest_instances, s);
sigaction(SIGABRT, &sigact, &s->sigact_old);
s->qemu_pid = fork(); s->qemu_pid = fork();
if (s->qemu_pid == 0) { if (s->qemu_pid == 0) {
@ -180,7 +202,12 @@ QTestState *qtest_init(const char *extra_args)
void qtest_quit(QTestState *s) void qtest_quit(QTestState *s)
{ {
sigaction(SIGABRT, &s->sigact_old, NULL); /* Uninstall SIGABRT handler on last instance */
if (qtest_instances && !qtest_instances->next) {
cleanup_sigabrt_handler();
}
qtest_instances = g_list_remove(qtest_instances, s);
kill_qemu(s); kill_qemu(s);
close(s->fd); close(s->fd);