Changeset 25724 in vbox for trunk/src/VBox/Runtime/generic

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/generic

Files:

• RTSemEventMultiWait-generic.cpp (modified) (2 diffs)
• RTSemEventWait-generic.cpp (modified) (2 diffs)
• RTSemMutexRequest-generic.cpp (modified) (2 diffs)
• RTSemMutexRequestDebug-generic.cpp (modified) (2 diffs)
• semrw-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp

@@ -43 +43 @@
 
 #undef RTSemEventMultiWait              /* undo debug mapping */
-RTDECL(int) RTSemEventMultiWait(RTSEMEVENTMULTI EventSem, unsigned cMillies)
+RTDECL(int) RTSemEventMultiWait(RTSEMEVENTMULTI EventSem, RTMSINTERVAL cMillies)
 {
     int rc;
@@ -62 +62 @@
                 if (u64Elapsed >= cMillies)
                     return VERR_TIMEOUT;
-                rc = RTSemEventMultiWaitNoResume(EventSem, cMillies - (unsigned)u64Elapsed);
+                rc = RTSemEventMultiWaitNoResume(EventSem, cMillies - (RTMSINTERVAL)u64Elapsed);
             } while (rc == VERR_INTERRUPTED);
         }

trunk/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp

@@ -43 +43 @@
 
 #undef RTSemEventWait                   /* undo debug mapping */
-RTDECL(int) RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
+RTDECL(int) RTSemEventWait(RTSEMEVENT EventSem, RTMSINTERVAL cMillies)
 {
     int rc;
@@ -62 +62 @@
                 if (u64Elapsed >= cMillies)
                     return VERR_TIMEOUT;
-                rc = RTSemEventWaitNoResume(EventSem, cMillies - (unsigned)u64Elapsed);
+                rc = RTSemEventWaitNoResume(EventSem, cMillies - (RTMSINTERVAL)u64Elapsed);
             } while (rc == VERR_INTERRUPTED);
         }

trunk/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp

@@ -43 +43 @@
 
 #undef RTSemMutexRequest                /* undo debug mapping */
-RTDECL(int) RTSemMutexRequest(RTSEMMUTEX Mutex, unsigned cMillies)
+RTDECL(int) RTSemMutexRequest(RTSEMMUTEX Mutex, RTMSINTERVAL cMillies)
 {
     int rc;
@@ -62 +62 @@
                 if (u64Elapsed >= cMillies)
                     return VERR_TIMEOUT;
-                rc = RTSemMutexRequestNoResume(Mutex, cMillies - (unsigned)u64Elapsed);
+                rc = RTSemMutexRequestNoResume(Mutex, cMillies - (RTMSINTERVAL)u64Elapsed);
             } while (rc == VERR_INTERRUPTED);
         }

trunk/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp

@@ -43 +43 @@
 
 
-RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX Mutex, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
+RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX Mutex, RTMSINTERVAL cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
     int rc;
@@ -62 +62 @@
                 if (u64Elapsed >= cMillies)
                     return VERR_TIMEOUT;
-                rc = RTSemMutexRequestNoResumeDebug(Mutex, cMillies - (unsigned)u64Elapsed, uId, RT_SRC_POS_ARGS);
+                rc = RTSemMutexRequestNoResumeDebug(Mutex, cMillies - (RTMSINTERVAL)u64Elapsed, uId, RT_SRC_POS_ARGS);
             } while (rc == VERR_INTERRUPTED);
         }

trunk/src/VBox/Runtime/generic/semrw-generic.cpp

@@ -263 +263 @@
     AssertReturn(pThis->u32Magic == RTSEMRW_MAGIC, VERR_INVALID_HANDLE);
 
-    unsigned        cMilliesInitial = cMillies;
+    RTMSINTERVAL    cMilliesInitial = cMillies;
     uint64_t        tsStart = 0;
     if (cMillies != RT_INDEFINITE_WAIT && cMillies != 0)
@@ -353 +353 @@
                 tsDelta /= 1000000;
                 if ((uint64_t)tsDelta < cMilliesInitial)
-                    cMilliesInitial = (unsigned)tsDelta;
+                    cMilliesInitial = (RTMSINTERVAL)tsDelta;
                 else
                     cMilliesInitial = 1;
@@ -555 +555 @@
      * Validate handle.
      */
-    struct RTSEMRWINTERNAL *pThis = hRWSem;
+    struct RTSEMRWINTERNAL *pThis   = hRWSem;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSEMRW_MAGIC, VERR_INVALID_HANDLE);
 
-    unsigned    cMilliesInitial = cMillies;
-    uint64_t    tsStart = 0;
+    RTMSINTERVAL    cMilliesInitial = cMillies;
+    uint64_t        tsStart         = 0;
     if (cMillies != RT_INDEFINITE_WAIT && cMillies != 0)
         tsStart = RTTimeNanoTS();
@@ -643 +643 @@
                 tsDelta /= 1000000;
                 if ((uint64_t)tsDelta < cMilliesInitial)
-                    cMilliesInitial = (unsigned)tsDelta;
+                    cMilliesInitial = (RTMSINTERVAL)tsDelta;
                 else
                     cMilliesInitial = 1;