Changeset 25724 in vbox for trunk/src/VBox/Runtime/r3/win

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.

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• fileaio-win.cpp (modified) (4 diffs)
• semevent-win.cpp (modified) (1 diff)
• semeventmulti-win.cpp (modified) (1 diff)
• semmutex-win.cpp (modified) (3 diffs)
• thread-win.cpp (modified) (1 diff)

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

@@ -386 +386 @@
 }
 
-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)
 {
@@ -417 +417 @@
     int cRequestsCompleted = 0;
     while (   !pCtxInt->fWokenUp
-           && (cMinReqs > 0))
+           && cMinReqs > 0)
     {
         uint64_t     StartNanoTS = 0;
-        DWORD        dwTimeout = cMillisTimeout == RT_INDEFINITE_WAIT ? INFINITE : cMillisTimeout;
+        DWORD        dwTimeout = cMillies == RT_INDEFINITE_WAIT ? INFINITE : cMillies;
         DWORD        cbTransfered;
         LPOVERLAPPED pOverlapped;
@@ -426 +426 @@
         BOOL         fSucceeded;
 
-        if (cMillisTimeout != RT_INDEFINITE_WAIT)
+        if (cMillies != RT_INDEFINITE_WAIT)
             StartNanoTS = RTTimeNanoTS();
 
@@ -446 +446 @@
         if (lCompletionKey == AIO_CONTEXT_WAKEUP_EVENT)
             break;
-        else
+
+        /* A request completed. */
+        PRTFILEAIOREQINTERNAL pReqInt = OVERLAPPED_2_RTFILEAIOREQINTERNAL(pOverlapped);
+        AssertPtr(pReqInt);
+        Assert(pReqInt->u32Magic == RTFILEAIOREQ_MAGIC);
+
+        /* Mark the request as finished. */
+        RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+
+        /* completion status. */
+        DWORD cbTransfered;
+        fSucceeded = GetOverlappedResult(pReqInt->hFile,
+                                         &pReqInt->Overlapped,
+                                         &cbTransfered,
+                                         FALSE);
+        pReqInt->cbTransfered = cbTransfered;
+        pReqInt->Rc = VINF_SUCCESS;
+
+        pahReqs[cRequestsCompleted++] = (RTFILEAIOREQ)pReqInt;
+
+        /* Update counter. */
+        cMinReqs--;
+
+        if (cMillies != RT_INDEFINITE_WAIT)
         {
-            /* A request completed. */
-            PRTFILEAIOREQINTERNAL pReqInt = OVERLAPPED_2_RTFILEAIOREQINTERNAL(pOverlapped);
-            AssertPtr(pReqInt);
-            Assert(pReqInt->u32Magic == RTFILEAIOREQ_MAGIC);
-
-            /* Mark the request as finished. */
-            RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
-
-            /* completion status. */
-            DWORD cbTransfered;
-            fSucceeded = GetOverlappedResult(pReqInt->hFile,
-                                             &pReqInt->Overlapped,
-                                             &cbTransfered,
-                                             FALSE);
-            pReqInt->cbTransfered = cbTransfered;
-            pReqInt->Rc = VINF_SUCCESS;
-
-            pahReqs[cRequestsCompleted++] = (RTFILEAIOREQ)pReqInt;
-
-            /* Update counter. */
-            cMinReqs --;
-
-            if (cMillisTimeout != RT_INDEFINITE_WAIT)
-            {
-                /* Recalculate timeout. */
-                uint64_t NanoTS = RTTimeNanoTS();
-                uint64_t cMilliesElapsed = (NanoTS - StartNanoTS) / 1000000;
-                cMillisTimeout -= cMilliesElapsed;
-            }
+            /* Recalculate timeout. */
+            uint64_t NanoTS = RTTimeNanoTS();
+            uint64_t cMilliesElapsed = (NanoTS - StartNanoTS) / 1000000;
+            if (cMilliesElapsed < cMillies)
+                cMillies -= cMilliesElapsed;
+            else
+                cMillies = 0;
         }
     }

trunk/src/VBox/Runtime/r3/win/semevent-win.cpp

@@ -197 +197 @@
 
 #undef RTSemEventWaitNoResume
-RTDECL(int)   RTSemEventWaitNoResume(RTSEMEVENT hEventSem, unsigned cMillies)
+RTDECL(int)   RTSemEventWaitNoResume(RTSEMEVENT hEventSem, RTMSINTERVAL cMillies)
 {
     PCRTLOCKVALSRCPOS pSrcPos = NULL;

trunk/src/VBox/Runtime/r3/win/semeventmulti-win.cpp

@@ -221 +221 @@
 
 #undef RTSemEventMultiWaitNoResume
-RTDECL(int)  RTSemEventMultiWaitNoResume(RTSEMEVENTMULTI hEventMultiSem, unsigned cMillies)
+RTDECL(int)  RTSemEventMultiWaitNoResume(RTSEMEVENTMULTI hEventMultiSem, RTMSINTERVAL cMillies)
 {
     PCRTLOCKVALSRCPOS pSrcPos = NULL;

trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp

@@ -174 +174 @@
  * @param   pSrcPos             The source position of the caller.
  */
-DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX hMutexSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
+DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX hMutexSem, RTMSINTERVAL cMillies, PCRTLOCKVALSRCPOS pSrcPos)
 {
     /*
@@ -251 +251 @@
 
 #undef RTSemMutexRequestNoResume
-RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMutexSem, unsigned cMillies)
+RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMutexSem, RTMSINTERVAL cMillies)
 {
 #ifndef RTSEMMUTEX_STRICT
@@ -262 +262 @@
 
 
-RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX hMutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
+RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX hMutexSem, RTMSINTERVAL cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
     RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -146 +146 @@
 
 
-RTR3DECL(int)   RTThreadSleep(unsigned cMillies)
+RTR3DECL(int)   RTThreadSleep(RTMSINTERVAL cMillies)
 {
     LogFlow(("RTThreadSleep: cMillies=%d\n", cMillies));