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

tests/qtest: Poll on waitpid() for a while before sending SIGKILL 

To prevent getting stuck on waitpid() in case the target process does
not terminate on SIGTERM, poll on waitpid() for 30s and if the target
process has not changed state until then send a SIGKILL to it.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230112143413.3979057-1-stefanb@linux.ibm.com
[PMM: changed TFR to RETRY_ON_EINTR]
This commit is contained in:
Stefan Berger 2023-01-12 09:34:13 -05:00
parent fb7e799034
commit 82df11e78d
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/qtest/libqtest.c
View File

@ -49,6 +49,8 @@
# define DEV_NULL "nul"
#endif
#define WAITPID_TIMEOUT 30
typedef void (*QTestSendFn)(QTestState *s, const char *buf);
typedef void (*ExternalSendFn)(void *s, const char *buf);
typedef GString* (*QTestRecvFn)(QTestState *);
@ -202,8 +204,24 @@ void qtest_wait_qemu(QTestState *s)
{
#ifndef _WIN32
pid_t pid;
uint64_t end;
/* 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);
if (pid == 0) {
kill(s->qemu_pid, SIGKILL);
pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
}
pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
assert(pid == s->qemu_pid);
#else
DWORD ret;