Changeset 25724 in vbox for trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

Timestamp:

Jan 11, 2010 2:45:34 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56467

Message:

iprt: Use RTMSINTERVAL for timeouts. Fixed missing timeout underflow checks in two RTFileAioCtxWait implementations.

File:

• trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/posix/fileaio-posix.cpp

@@ -807 +807 @@
 
 
-RTDECL(int) RTFileAioCtxWait(RTFILEAIOCTX hAioCtx, size_t cMinReqs, unsigned cMillisTimeout,
+RTDECL(int) RTFileAioCtxWait(RTFILEAIOCTX hAioCtx, size_t cMinReqs, RTMSINTERVAL cMillies,
                              PRTFILEAIOREQ pahReqs, size_t cReqs, uint32_t *pcReqs)
 {
@@ -832 +832 @@
         return VERR_INVALID_PARAMETER;
 
-    if (cMillisTimeout != RT_INDEFINITE_WAIT)
+    if (cMillies != RT_INDEFINITE_WAIT)
     {
-        Timeout.tv_sec  = cMillisTimeout / 1000;
-        Timeout.tv_nsec = (cMillisTimeout % 1000) * 1000000;
+        Timeout.tv_sec  = cMillies / 1000;
+        Timeout.tv_nsec = (cMillies % 1000) * 1000000;
         pTimeout = &Timeout;
         StartNanoTS = RTTimeNanoTS();
@@ -964 +964 @@
                 break;
 
-            if (cMillisTimeout != RT_INDEFINITE_WAIT)
+            if (cMillies != RT_INDEFINITE_WAIT)
             {
                 uint64_t TimeDiff;
@@ -970 +970 @@
                 /* Recalculate the timeout. */
                 TimeDiff = RTTimeSystemNanoTS() - StartNanoTS;
-                Timeout.tv_sec = Timeout.tv_sec - (TimeDiff / 1000000);
+                Timeout.tv_sec  = Timeout.tv_sec  - (TimeDiff / 1000000);
                 Timeout.tv_nsec = Timeout.tv_nsec - (TimeDiff % 1000000);
             }