CloseHandle((HANDLE)pid);
#endif
s->qemu_pid = -1;
+ qtest_remove_abrt_handler(s);
}
return false;
}
static void qtest_check_status(QTestState *s)
{
+ assert(s->qemu_pid == -1);
+
/*
* Check whether qemu exited with expected exit status; anything else is
* fishy and should be logged with as much detail as possible.
void qtest_wait_qemu(QTestState *s)
{
+ if (s->qemu_pid != -1) {
#ifndef _WIN32
- pid_t pid;
- uint64_t end;
+ pid_t pid;
+ uint64_t end;
- /* poll for a while until sending SIGKILL */
- end = g_get_monotonic_time() + WAITPID_TIMEOUT * G_TIME_SPAN_SECOND;
+ /* poll for a while until sending SIGKILL */
+ end = g_get_monotonic_time() + WAITPID_TIMEOUT * G_TIME_SPAN_SECOND;
- do {
- pid = waitpid(s->qemu_pid, &s->wstatus, WNOHANG);
- if (pid != 0) {
- break;
- }
- g_usleep(100 * 1000);
- } while (g_get_monotonic_time() < end);
+ do {
+ pid = waitpid(s->qemu_pid, &s->wstatus, WNOHANG);
+ if (pid != 0) {
+ break;
+ }
+ g_usleep(100 * 1000);
+ } while (g_get_monotonic_time() < end);
- if (pid == 0) {
- kill(s->qemu_pid, SIGKILL);
- pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
- }
+ if (pid == 0) {
+ kill(s->qemu_pid, SIGKILL);
+ pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
+ }
- assert(pid == s->qemu_pid);
+ assert(pid == s->qemu_pid);
#else
- DWORD ret;
+ DWORD ret;
- ret = WaitForSingleObject((HANDLE)s->qemu_pid, INFINITE);
- assert(ret == WAIT_OBJECT_0);
- GetExitCodeProcess((HANDLE)s->qemu_pid, &s->exit_code);
- CloseHandle((HANDLE)s->qemu_pid);
+ ret = WaitForSingleObject((HANDLE)s->qemu_pid, INFINITE);
+ assert(ret == WAIT_OBJECT_0);
+ GetExitCodeProcess((HANDLE)s->qemu_pid, &s->exit_code);
+ CloseHandle((HANDLE)s->qemu_pid);
#endif
+ s->qemu_pid = -1;
+ qtest_remove_abrt_handler(s);
+ }
qtest_check_status(s);
}
TerminateProcess((HANDLE)s->qemu_pid, s->expected_status);
#endif
qtest_wait_qemu(s);
- s->qemu_pid = -1;
return;
}
void qtest_remove_abrt_handler(void *data)
{
GHook *hook = g_hook_find_data(&abrt_hooks, TRUE, data);
+
+ if (!hook) {
+ return;
+ }
+
g_hook_destroy_link(&abrt_hooks, hook);
/* Uninstall SIGABRT handler on last instance */