From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzuZ9-0004Qh-26 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 17:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzuZ5-0000FI-TC for qemu-devel@nongnu.org; Fri, 20 Nov 2015 17:54:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzuZ5-0000F5-NX for qemu-devel@nongnu.org; Fri, 20 Nov 2015 17:53:59 -0500 From: John Snow Date: Fri, 20 Nov 2015 17:53:54 -0500 Message-Id: <1448060035-31973-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1448060035-31973-1-git-send-email-jsnow@redhat.com> References: <1448060035-31973-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] 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 fudge it by counting nsleep calls. Signed-off-by: John Snow --- tests/ide-test.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/ide-test.c b/tests/ide-test.c index fc1ce52..d37dc5e 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -642,15 +642,20 @@ static void nsleep(int64_t nsecs) static uint8_t ide_wait_clear(uint8_t flag) { - int i; uint8_t data; + time_t st, now; /* 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; } + time(&now); + if (difftime(now, st) > 5.0) { + break; + } nsleep(400); } g_assert_not_reached(); @@ -658,14 +663,19 @@ static uint8_t ide_wait_clear(uint8_t flag) static void ide_wait_intr(int irq) { - int i; + time_t st, now; bool intr; - for (i = 0; i <= 12500000; i++) { + time(&st); + while (true) { intr = get_irq(irq); if (intr) { return; } + time(&now); + if (difftime(now, st) > 5.0) { + break; + } nsleep(400); } -- 2.4.3