From nobody Sun Apr 28 09:36:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545019159059609.4354255036818; Sun, 16 Dec 2018 19:59:19 -0800 (PST) Received: from localhost ([::1]:44749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYk3o-0006fS-Tl for importer@patchew.org; Sun, 16 Dec 2018 22:59:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYk2z-0006Kq-5R for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:58:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYk2v-0004jP-Vk for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:58:25 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:36882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gYk2v-0004fT-Ds for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:58:21 -0500 Received: by mail-pg1-x541.google.com with SMTP id c25so3934189pgb.4 for ; Sun, 16 Dec 2018 19:58:20 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id f67sm25727551pff.29.2018.12.16.19.58.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Dec 2018 19:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=w7fWnVzY/WUPJH5roDqudJcuJDnr5Q6BtqUrE7en6Jk=; b=B9oqlUCVDIvCwI5fuSRPQNgtohZ5WEV61bjmDa+dwxrtmFaYpf8JJpvAtcfDkJIr1C Fig1NFTDx9k0L8nGSMcIFJ9zI5WHBUYq7Khur2ULRB5C1/867ljBReqbjr/NENf6anXC AyXdzz8GbejpzkT+qXXIxqqSATAQ0NATJXLCA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=w7fWnVzY/WUPJH5roDqudJcuJDnr5Q6BtqUrE7en6Jk=; b=hJRSP5z2B7tE5z3b4nKfBU2ZfN9uBfDf2NwVMjnZJLufNKr2b/pnwfUKqStid+iX5+ xsvbkAy88VTMG+cx3prQSWtthisNNg0orU3ygTtpa/D1Sso/Yq+4Rjx7MWIZc/obX5Jd Zbdxdcg9AVqR7DKytzVO4Obh5HzqyHUgOaruBXkzCFT67RXkeAI2HUwmml9VuWKV6eZ5 5ngIBYyhjvgxOOn5NNPAfU7mGxIZCmjh0cq/kbh62Bma+anInjnAYzXMAhIXQvZSpz1c ctRR3jFJPeq+R+IKBOE0pNL8PFpQ/Hxb0JuS15/9s3pzZIDXhuFvrktJ5fTx0cJpLnJA Kn5A== X-Gm-Message-State: AA+aEWZ2p7j64rbKEb7pGn+IkzBTzhn5tnbhwPyWX1ol8b3avMRGB4DV c9LQyTfEGt3ZDyoMudL8KP9urP1+Zf8= X-Google-Smtp-Source: AFSGD/UYSXqZGFeyZbDE0epx14NuWfljZx86PxMRNLxZVylHS+VAdenX43puys4g2CrSDRRU+fW01g== X-Received: by 2002:a62:870e:: with SMTP id i14mr11758902pfe.41.1545019099469; Sun, 16 Dec 2018 19:58:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 16 Dec 2018 19:58:16 -0800 Message-Id: <20181217035816.21777-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH] tests: Exit boot-serial-test loop if child dies X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's no point in waiting 5 full minutes when there will be no more output. Compute timeout based on elapsed wall clock time instead of N * delays, as the delay is a minimum sleep time. Cc: Thomas Huth Cc: Laurent Vivier Cc: Paolo Bonzini Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/libqtest.h | 8 +++++ tests/boot-serial-test.c | 16 +++++++-- tests/libqtest.c | 70 +++++++++++++++++++++++++--------------- 3 files changed, 65 insertions(+), 29 deletions(-) diff --git a/tests/libqtest.h b/tests/libqtest.h index 96a6c01352..9758c51be6 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -1011,4 +1011,12 @@ bool qmp_rsp_is_err(QDict *rsp); */ void qmp_assert_error_class(QDict *rsp, const char *class); =20 +/** + * qtest_probe_child: + * @s: QTestState instance to operate on. + * + * Returns: true if the child is still alive. + */ +bool qtest_probe_child(QTestState *s); + #endif diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index 8ec6aed35d..54b9347325 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -130,11 +130,12 @@ static testdef_t tests[] =3D { =20 static bool check_guest_output(const testdef_t *test, int fd) { - int i, nbr =3D 0, pos =3D 0, ccnt; + int nbr =3D 0, pos =3D 0, ccnt; + time_t now, start =3D time(NULL); char ch; =20 - /* Poll serial output... Wait at most 360 seconds */ - for (i =3D 0; i < 36000; ++i) { + /* Poll serial output... */ + while (1) { ccnt =3D 0; while (ccnt++ < 512 && (nbr =3D read(fd, &ch, 1)) =3D=3D 1) { if (ch =3D=3D test->expect[pos]) { @@ -148,6 +149,15 @@ static bool check_guest_output(const testdef_t *test, = int fd) } } g_assert(nbr >=3D 0); + /* Wait only if the child is still alive. */ + if (!qtest_probe_child(global_qtest)) { + break; + } + /* Wait at most 360 seconds. */ + now =3D time(NULL); + if (now - start >=3D 360) { + break; + } g_usleep(10000); } =20 diff --git a/tests/libqtest.c b/tests/libqtest.c index 43be078518..1d75d3c936 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -39,10 +39,11 @@ struct QTestState { int fd; int qmp_fd; + pid_t qemu_pid; /* our child QEMU process */ + int wstatus; + bool big_endian; bool irq_level[MAX_IRQ]; GString *rx; - pid_t qemu_pid; /* our child QEMU process */ - bool big_endian; }; =20 static GHookList abrt_hooks; @@ -96,36 +97,52 @@ static int socket_accept(int sock) return ret; } =20 +bool qtest_probe_child(QTestState *s) +{ + pid_t pid =3D s->qemu_pid; + + if (pid !=3D -1) { + pid =3D waitpid(pid, &s->wstatus, WNOHANG); + if (pid =3D=3D 0) { + return true; + } + s->qemu_pid =3D -1; + } + return false; +} + static void kill_qemu(QTestState *s) { - if (s->qemu_pid !=3D -1) { - int wstatus =3D 0; - pid_t pid; - - kill(s->qemu_pid, SIGTERM); - TFR(pid =3D waitpid(s->qemu_pid, &wstatus, 0)); + pid_t pid =3D s->qemu_pid; + int wstatus; =20 + /* Skip wait if qtest_probe_child already reaped. */ + if (pid !=3D -1) { + kill(pid, SIGTERM); + TFR(pid =3D waitpid(s->qemu_pid, &s->wstatus, 0)); assert(pid =3D=3D s->qemu_pid); - /* - * We expect qemu to exit with status 0; anything else is - * fishy and should be logged with as much detail as possible. - */ - if (wstatus) { - if (WIFEXITED(wstatus)) { - fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEM= U " - "process but encountered exit status %d\n", - __FILE__, __LINE__, WEXITSTATUS(wstatus)); - } else if (WIFSIGNALED(wstatus)) { - int sig =3D WTERMSIG(wstatus); - const char *signame =3D strsignal(sig) ?: "unknown ???"; - const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)"= : ""; + } =20 - fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " - "from signal %d (%s)%s\n", - __FILE__, __LINE__, sig, signame, dump); - } - abort(); + /* + * We expect qemu to exit with status 0; anything else is + * fishy and should be logged with as much detail as possible. + */ + wstatus =3D s->wstatus; + if (wstatus) { + if (WIFEXITED(wstatus)) { + fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU " + "process but encountered exit status %d\n", + __FILE__, __LINE__, WEXITSTATUS(wstatus)); + } else if (WIFSIGNALED(wstatus)) { + int sig =3D WTERMSIG(wstatus); + const char *signame =3D strsignal(sig) ?: "unknown ???"; + const char *dump =3D WCOREDUMP(wstatus) ? " (core dumped)" : "= "; + + fprintf(stderr, "%s:%d: kill_qemu() detected QEMU death " + "from signal %d (%s)%s\n", + __FILE__, __LINE__, sig, signame, dump); } + abort(); } } =20 @@ -228,6 +245,7 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) =20 g_test_message("starting QEMU: %s", command); =20 + s->wstatus =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { setenv("QEMU_AUDIO_DRV", "none", true); --=20 2.17.2