From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1JNx-0006DP-Rv for qemu-devel@nongnu.org; Tue, 24 Nov 2015 14:36:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1JNv-0005Qw-3z for qemu-devel@nongnu.org; Tue, 24 Nov 2015 14:36:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1JNu-0005Qs-V8 for qemu-devel@nongnu.org; Tue, 24 Nov 2015 14:36:15 -0500 From: John Snow Date: Tue, 24 Nov 2015 14:36:11 -0500 Message-Id: <1448393771-15483-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1448393771-15483-1-git-send-email-jsnow@redhat.com> References: <1448393771-15483-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/1] ide-test: fix timeouts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, John Snow , pl@kamp.de Use explicit timeouts instead of trying to approximate it by counting the cumulative duration of nsleep calls. In practice, the timeout if inb() dwarfed the nsleep delays, and as a result the real timeout value became a lot larger than 5 seconds. So: change the semantics from "Not sooner than 5 seconds" to "no more than 5 seconds" to ensure we don't hang the tester for very long. Signed-off-by: John Snow --- tests/ide-test.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/ide-test.c b/tests/ide-test.c index fc1ce52..c14910b 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -642,15 +642,19 @@ static void nsleep(int64_t nsecs) static uint8_t ide_wait_clear(uint8_t flag) { - int i; uint8_t data; + time_t st; /* Wait with a 5 second timeout */ - for (i = 0; i <= 12500000; i++) { + time(&st); + while (true) { data = inb(IDE_BASE + reg_status); if (!(data & flag)) { return data; } + if (difftime(time(NULL), st) > 5.0) { + break; + } nsleep(400); } g_assert_not_reached(); @@ -658,14 +662,18 @@ static uint8_t ide_wait_clear(uint8_t flag) static void ide_wait_intr(int irq) { - int i; + time_t st; bool intr; - for (i = 0; i <= 12500000; i++) { + time(&st); + while (true) { intr = get_irq(irq); if (intr) { return; } + if (difftime(time(NULL), st) > 5.0) { + break; + } nsleep(400); } -- 2.4.3