tests/qtest: Poll on waitpid() for a while before sending SIGKILL
PATCH v2 1/1 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 <[email protected]>
Reviewed-by Daniel P. Berrangé <[email protected]>
--- tests/qtest/libqtest.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
tests/qtest/libqtest.c +19 -1
@@ -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 _WIN32pid_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 ); +TFR (pid =waitpid (s->qemu_pid, &s->wstatus,0 )); + } -TFR (pid =waitpid (s->qemu_pid, &s->wstatus,0 ));assert (pid == s->qemu_pid);#else DWORD ret;
Signature · 1 line
2.39.0