From b5b1aca92b2793175d3662071fd288d84c6f18c8 Mon Sep 17 00:00:00 2001 From: andrewfish Date: Tue, 22 Mar 2011 20:30:35 +0000 Subject: Fix gBS->Stall bug. The current code would only stall for a single timer tick. Fixing this issue exposed another issue with time slip in the stall that was also fixed. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11414 6f19259b-4bc3-4df7-8a09-765794883524 --- UnixPkg/Sec/UnixThunk.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/UnixPkg/Sec/UnixThunk.c b/UnixPkg/Sec/UnixThunk.c index f65acab100..eb9e536989 100644 --- a/UnixPkg/Sec/UnixThunk.c +++ b/UnixPkg/Sec/UnixThunk.c @@ -142,17 +142,36 @@ void msSleep (unsigned long Milliseconds) { struct timespec rq, rm; - + struct timeval start, end; + unsigned long MicroSec; + rq.tv_sec = Milliseconds / 1000; rq.tv_nsec = (Milliseconds % 1000) * 1000000; - while (nanosleep (&rq, &rm) != -1) { + // + // nanosleep gets interrupted by our timer tic. + // we need to track wall clock time or we will stall for way too long + // + gettimeofday (&start, NULL); + end.tv_sec = start.tv_sec + rq.tv_sec; + MicroSec = (start.tv_usec + rq.tv_nsec/1000); + end.tv_usec = MicroSec % 1000000; + if (MicroSec > 1000000) { + end.tv_sec++; + } + + while (nanosleep (&rq, &rm) == -1) { if (errno != EINTR) { break; } + gettimeofday (&start, NULL); + if (start.tv_sec > end.tv_sec) { + break; + } if ((start.tv_sec == end.tv_sec) && (start.tv_usec > end.tv_usec)) { + break; + } rq = rm; } - } void -- cgit v1.2.3